Eliminate OnConnect usage

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 486 matching lines @@
 const char kChromeServiceName[] = "chrome";
 
 // Packaged service implementation used to expose miscellaneous application
 // control features. This is a singleton service which runs on the main thread
 // and never stops.
 class ChromeServiceChromeOS
     : public service_manager::Service,
       public mash::mojom::Launchable,
       public service_manager::InterfaceFactory<mash::mojom::Launchable> {
  public:
-  ChromeServiceChromeOS()
-      : interfaces_(service_manager::mojom::kServiceManager_ConnectorSpec) {
+  ChromeServiceChromeOS() {
     interfaces_.AddInterface<mash::mojom::Launchable>(this);
   }
   ~ChromeServiceChromeOS() override {}
 
   static std::unique_ptr<service_manager::Service> CreateService() {
     return base::MakeUnique<ChromeServiceChromeOS>();
   }
 
  private:
   void CreateNewWindowImpl(bool is_incognito) {
     Profile* profile = ProfileManager::GetActiveUserProfile();
     chrome::NewEmptyWindow(is_incognito ? profile->GetOffTheRecordProfile()
                                         : profile);
   }
 
   // service_manager::Service:
   void OnBindInterface(const service_manager::ServiceInfo& remote_info,
                        const std::string& name,
                        mojo::ScopedMessagePipeHandle handle) override {
-    interfaces_.BindInterface(name, std::move(handle));
+    interfaces_.BindInterface(remote_info.identity, name, std::move(handle));
   }
 
   // mash::mojom::Launchable:
   void Launch(uint32_t what, mash::mojom::LaunchMode how) override {
     if (how != mash::mojom::LaunchMode::MAKE_NEW) {
       LOG(ERROR) << "Unable to handle Launch request with how = " << how;
       return;
     }
     switch (what) {
       case mash::mojom::kWindow:
         CreateNewWindowImpl(false /* is_incognito */);
         break;
       case mash::mojom::kIncognitoWindow:
         CreateNewWindowImpl(true /* is_incognito */);
         break;
       default:
         NOTREACHED();
     }
   }
 
   // mojo::InterfaceFactory<mash::mojom::Launchable>:
   void Create(const service_manager::Identity& remote_identity,
               mash::mojom::LaunchableRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
-  service_manager::InterfaceRegistry interfaces_;
+  service_manager::BinderRegistry interfaces_;
   mojo::BindingSet<mash::mojom::Launchable> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeServiceChromeOS);
 };
 
 #endif  // defined(OS_CHROMEOS)
 
 // Returns a copy of the given url with its host set to given host and path set
 // to given path. Other parts of the url will be the same.
 GURL ReplaceURLHostAndPath(const GURL& url,
@@ skipping 3054 matching lines @@
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }
 
 // static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;
 }