Roll mojo2

DEPS

@@ -19,7 +19,7 @@
 
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
-  'mojo_sdk_revision': '55352570f8c52ca1282dcfa26a4a32adc08495d6',
+  'mojo_sdk_revision': 'fbe912aa65e0346382bc1e2874eb88fa3aad3358',
   'base_revision': '672b04e54b937ec899429a6bd5409c5a6300d151',
   'skia_revision': '8cc209111876b7c78b5ec577c9221d8ed5e21024',
 

mojo/VERSION

@@ -1 +1 @@
-9a791294e429f9f2ca4f427796a284edb6f6768e
+7d579155cc597aa3befcbfad66eef54bda06b57c

mojo/application/application_runner_chromium.cc

@@ -11,13 +11,14 @@
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/system/handle.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 namespace mojo {
 
 // static
-void ApplicationImpl::Terminate() {
+void ApplicationImplBase::Terminate() {
   if (base::MessageLoop::current()->is_running())
     base::MessageLoop::current()->Quit();
 }

mojo/application/content_handler_factory.cc

@@ -4,7 +4,7 @@
 
 #include "mojo/application/content_handler_factory.h"
 
-#include <set>
+#include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -14,7 +14,6 @@
 #include "base/trace_event/trace_event.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/message_pump/message_pump_mojo.h"
-#include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
@@ -112,11 +111,13 @@ class ContentHandlerImpl : public ContentHandler {
 
 }  // namespace
 
-ContentHandlerFactory::ContentHandlerFactory(Delegate* delegate)
-    : delegate_(delegate) {
-}
-
-ContentHandlerFactory::~ContentHandlerFactory() {
+// static
+ServiceProviderImpl::InterfaceRequestHandler<ContentHandler>
+ContentHandlerFactory::GetInterfaceRequestHandler(Delegate* delegate) {
+  return [delegate](const ConnectionContext& connection_context,
+                    InterfaceRequest<ContentHandler> content_handler_request) {
+    new ContentHandlerImpl(delegate, content_handler_request.Pass());
+  };
 }
 
 void ContentHandlerFactory::ManagedDelegate::RunApplication(
@@ -129,9 +130,4 @@ void ContentHandlerFactory::ManagedDelegate::RunApplication(
     loop.Run();
 }
 
-void ContentHandlerFactory::Create(ApplicationConnection* connection,
-                                   InterfaceRequest<ContentHandler> request) {
-  new ContentHandlerImpl(delegate_, request.Pass());
-}
-
 }  // namespace mojo

mojo/application/content_handler_factory.h

@@ -6,14 +6,18 @@
 #define MOJO_APPLICATION_CONTENT_HANDLER_FACTORY_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/public/cpp/application/interface_factory.h"
+#include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 #include "mojo/services/network/interfaces/url_loader.mojom.h"
 
 namespace mojo {
 
-class ContentHandlerFactory : public InterfaceFactory<ContentHandler> {
+struct ConnectionContext;
+
+// TODO(vtl): Nuke this class. Now it's only a "namespace" for stuff, most of
+// which is overcomplicated.
+class ContentHandlerFactory {
  public:
   class HandledApplicationHolder {
    public:
@@ -46,17 +50,9 @@ class ContentHandlerFactory : public InterfaceFactory<ContentHandler> {
                         URLResponsePtr response) override;
   };
 
-  explicit ContentHandlerFactory(Delegate* delegate);
-  ~ContentHandlerFactory() override;
-
- private:
-  // From InterfaceFactory:
-  void Create(ApplicationConnection* connection,
-              InterfaceRequest<ContentHandler> request) override;
-
-  Delegate* delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(ContentHandlerFactory);
+  // For use with |ServiceProviderImpl::AddService<ContentHandler>()|.
+  static ServiceProviderImpl::InterfaceRequestHandler<ContentHandler>
+  GetInterfaceRequestHandler(Delegate* delegate);
 };
 
 template <class A>

mojo/common/BUILD.gn

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//mojo/public/mojo_application.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
@@ -40,13 +41,13 @@ source_set("tests") {
   ]
 }
 
-test("mojo_common_unittests") {
+mojo_native_application("mojo_common_apptests") {
+  testonly = true
+
   deps = [
     ":tests",
-    "//mojo/data_pipe_utils:tests",
-    "//mojo/edk/test:run_all_unittests",
-    "//mojo/environment:chromium",
-    "//mojo/message_pump:tests",
+    "//mojo/application",
+    "//mojo/application:test_support",
   ]
 }
 

mojo/common/trace_provider_impl.cc

@@ -12,7 +12,6 @@
 #include "base/time/time.h"
 #include "base/trace_event/trace_config.h"
 #include "base/trace_event/trace_event.h"
-#include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_impl.h"
 
 namespace mojo {

mojo/dart/packages/mojo/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.4.23
+
+  - 28 changes: https://github.com/domokit/mojo/compare/107bac0...ef5cd66
+
+  MOJO_SDK: ef5cd660ec6f1c50eaff62c81ea7662662d04e15
+
+## 0.4.22
+
+  - 22 changes: https://github.com/domokit/mojo/compare/12d71ee...f56fd59
+
+  MOJO_SDK: f56fd59ec51e1ecdd52fb848ceff1b6b6fe7f7fa
+
+## 0.4.21
+
+  - 35 changes: https://github.com/domokit/mojo/compare/e95b5db...c200560
+
+  MOJO_SDK: c200560ac45a79b61b8e8c0444af471789f5669f
+
 ## 0.4.20
 
   - 125 changes: https://github.com/domokit/mojo/compare/2f662f4...705723c

mojo/dart/packages/mojo/lib/bindings.dart

@@ -17,6 +17,7 @@ import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart'
 part 'src/control_message.dart';
 part 'src/codec.dart';
 part 'src/enum.dart';
+part 'src/interfaces.dart';
 part 'src/message.dart';
 part 'src/proxy.dart';
 part 'src/struct.dart';

mojo/dart/packages/mojo/lib/core.dart

@@ -5,15 +5,16 @@
 library core;
 
 import 'dart:async';
-import 'dart:collection';
 import 'dart:isolate';
-import 'dart:mojo.internal';
 import 'dart:typed_data';
 
+import 'src/internal.dart';
+
 part 'src/buffer.dart';
 part 'src/data_pipe.dart';
 part 'src/drain_data.dart';
-part 'src/event_stream.dart';
+part 'src/event_subscription.dart';
+part 'src/event_handler.dart';
 part 'src/fill_data.dart';
 part 'src/handle.dart';
 part 'src/message_pipe.dart';