Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc

 // Copyright 2014 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/geometry/geometry_type_converters.h"
-#include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
+#include "mojo/public/cpp/shell/connect.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 
 // TODO(sky): remove this when Darin is done with cleanup.
@@ skipping 341 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 class ViewManagerConnectionTest : public testing::Test {
  public:
   ViewManagerConnectionTest() {}
 
   virtual void SetUp() OVERRIDE {
     test_helper_.Init();
 
-    ConnectToService(test_helper_.service_provider(),
-                     "mojo:mojo_view_manager",
-                     &view_manager_);
+    ConnectTo(test_helper_.shell(), "mojo:mojo_view_manager", &view_manager_);
     view_manager_.set_client(&client_);
 
     client_.WaitForId();
     client_.GetAndClearChanges();
   }
 
  protected:
   // Creates a second connection to the viewmanager.
   void EstablishSecondConnection() {
-    ConnectToService(test_helper_.service_provider(),
-                     "mojo:mojo_view_manager",
-                     &view_manager2_);
+    ConnectTo(test_helper_.shell(), "mojo:mojo_view_manager", &view_manager2_);
     view_manager2_.set_client(&client2_);
 
     client2_.WaitForId();
     client2_.GetAndClearChanges();
   }
 
   void EstablishSecondConnectionWithRoot(TransportNodeId root_id) {
     EstablishSecondConnection();
     client2_.ClearId();
 
@@ skipping 1039 matching lines @@
   ASSERT_EQ(1u, nodes.size());
   EXPECT_EQ("node=1,1 parent=null view=null", nodes[0].ToString());
 }
 
 // TODO(sky): add coverage of test that destroys connections and ensures other
 // connections get deletion notification (or advanced server id).
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo