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

services/navigation/navigation_unittest.cc

 // Copyright 2015 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 <memory>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/navigation/public/interfaces/view.mojom.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_test.h"
 
 namespace navigation {
 
 class NavigationTest : public service_manager::test::ServiceTest,
                        public mojom::ViewClient {
  public:
   NavigationTest()
       : service_manager::test::ServiceTest("navigation_unittests"),
         binding_(this) {}
   ~NavigationTest() override {}
 
  protected:
    void SetUp() override {
      service_manager::test::ServiceTest::SetUp();
-     window_manager_connection_ = connector()->Connect("test_wm");
+     connector()->StartService("test_wm");
    }
 
   mojom::ViewClientPtr GetViewClient() {
     return binding_.CreateInterfacePtrAndBind();
   }
 
   void QuitOnLoadingStateChange(base::RunLoop* loop) {
     loop_ = loop;
   }
 
@@ skipping 21 matching lines @@
   void NavigationCommitted(
       mojom::NavigationCommittedDetailsPtr details,
       int current_index) override {}
   void NavigationEntryChanged(mojom::NavigationEntryPtr entry,
                               int entry_index) override {}
   void NavigationListPruned(bool from_front, int count) override {}
 
   int load_count_ = 0;
   mojo::Binding<mojom::ViewClient> binding_;
   base::RunLoop* loop_ = nullptr;
-  std::unique_ptr<service_manager::Connection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationTest);
 };
 
 // See crbug.com/619523
 TEST_F(NavigationTest, DISABLED_Navigate) {
   mojom::ViewFactoryPtr view_factory;
   connector()->BindInterface("navigation", &view_factory);
 
   mojom::ViewPtr view;
   view_factory->CreateView(GetViewClient(), MakeRequest(&view));
   view->NavigateTo(GURL("about:blank"));
 
   base::RunLoop loop;
   QuitOnLoadingStateChange(&loop);
   loop.Run();
 }
 
 }  // namespace navigation