Remove Client relationship between mojo.Shell/mojo.Application

services/window_manager/window_manager_api_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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 65 matching lines @@
   typedef base::Callback<void(View*)> RootAddedCallback;
 
   explicit TestApplicationLoader(const RootAddedCallback& root_added_callback)
       : root_added_callback_(root_added_callback) {}
   ~TestApplicationLoader() override {}
 
  private:
   // Overridden from mojo::ApplicationLoader:
   void Load(mojo::ApplicationManager* application_manager,
             const GURL& url,
-            mojo::ShellPtr shell,
+            mojo::InterfaceRequest<mojo::Application> application_request,
             LoadCallback callback) override {
-    ASSERT_TRUE(shell);
-    scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this, shell.Pass()));
+    ASSERT_TRUE(application_request.is_pending());
+    scoped_ptr<ApplicationImpl> app(
+        new ApplicationImpl(this, application_request.Pass()));
     apps_.push_back(app.release());
   }
   void OnApplicationError(mojo::ApplicationManager* application_manager,
                           const GURL& url) override {}
 
   // Overridden from mojo::ApplicationDelegate:
   void Initialize(ApplicationImpl* app) override {
     view_manager_client_factory_.reset(
         new mojo::ViewManagerClientFactory(app->shell(), this));
   }
@@ skipping 157 matching lines @@
 
   Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace window_manager