Eliminate Connector::Connect(), Connection, etc.

chrome/test/base/mash_browser_tests_main.cc

 // Copyright 2016 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 <algorithm>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
@@ skipping 26 matching lines @@
 #include "services/service_manager/runner/init.h"
 #include "services/ui/common/switches.h"
 #include "ui/aura/env.h"
 
 namespace {
 
 const base::FilePath::CharType kCatalogFilename[] =
     FILE_PATH_LITERAL("mash_browser_tests_catalog.json");
 
 void ConnectToDefaultApps(service_manager::Connector* connector) {
-  connector->Connect(mash::session::mojom::kServiceName);
+  connector->StartService(mash::session::mojom::kServiceName);
 }
 
 class MashTestSuite : public ChromeTestSuite {
  public:
   MashTestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {}
 
   void SetMojoTestConnector(std::unique_ptr<MojoTestConnector> connector) {
     mojo_test_connector_ = std::move(connector);
   }
 
@@ skipping 144 matching lines @@
   if (command_line->HasSwitch(content::kSingleProcessTestsFlag) &&
       !command_line->HasSwitch(switches::kPrimordialPipeToken)) {
     service_manager_connection_factory =
         base::Bind(&CreateServiceManagerConnection, &delegate);
     content::ServiceManagerConnection::SetFactoryForTest(
         &service_manager_connection_factory);
   }
   *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv);
   return true;
 }