Change Shell / ShellClient to ServiceProvider

mojo/services/public/cpp/view_manager/tests/view_manager_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 "mojo/services/public/cpp/view_manager/view_manager.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
@@ skipping 228 matching lines @@
   }
 
   void DestroyViewManager1() {
     view_manager_1_.reset();
   }
 
  private:
   // Overridden from testing::Test:
   virtual void SetUp() OVERRIDE {
     test_helper_.Init();
-    view_manager_1_.reset(new ViewManager(test_helper_.shell()));
-    view_manager_2_.reset(new ViewManager(test_helper_.shell()));
+    view_manager_1_.reset(new ViewManager(test_helper_.service_provider()));
+    view_manager_2_.reset(new ViewManager(test_helper_.service_provider()));
     view_manager_1_->Init();
     view_manager_2_->Init();
   }
 
   base::MessageLoop loop_;
   shell::ShellTestHelper test_helper_;
   scoped_ptr<ViewManager> view_manager_1_;
   scoped_ptr<ViewManager> view_manager_2_;
   int commit_count_;
 
@@ skipping 311 matching lines @@
 
   node1->SetBounds(gfx::Rect(0, 0, 100, 100));
   WaitForBoundsToChange(node1_2);
   EXPECT_EQ(node1->bounds(), node1_2->bounds());
 
 
 }
 
 }  // namespace view_manager
 }  // namespace mojo