Update view_manager and window_manager to make use of content handling.

mojo/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/memory/scoped_vector.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
@@ skipping 81 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWindowManagerClient);
 };
 
 class TestApplicationLoader : public ApplicationLoader,
                               public ApplicationDelegate,
                               public ViewManagerDelegate {
  public:
   typedef base::Callback<void(View*)> RootAddedCallback;
 
   explicit TestApplicationLoader(const RootAddedCallback& root_added_callback)
-      : root_added_callback_(root_added_callback),
-        view_manager_client_factory_(this) {}
+      : root_added_callback_(root_added_callback) {}
   virtual ~TestApplicationLoader() {}
 
  private:
   // Overridden from ApplicationLoader:
   virtual void Load(ApplicationManager* application_manager,
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) MOJO_OVERRIDE {
     ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
     if (!shell_handle.is_valid())
       return;
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, shell_handle.Pass()));
     apps_.push_back(app.release());
   }
   virtual void OnApplicationError(ApplicationManager* application_manager,
                                   const GURL& url) MOJO_OVERRIDE {}
 
   // Overridden from ApplicationDelegate:
+  virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
+    view_manager_client_factory_.reset(
+        new ViewManagerClientFactory(app->shell(), this));
+  }
+
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) MOJO_OVERRIDE {
-    connection->AddService(&view_manager_client_factory_);
+    connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(
       ViewManager* view_manager,
       View* root,
       ServiceProviderImpl* exported_services,
       scoped_ptr<ServiceProvider> imported_services) MOJO_OVERRIDE {
     root_added_callback_.Run(root);
   }
   virtual void OnViewManagerDisconnected(
       ViewManager* view_manager) MOJO_OVERRIDE {
   }
 
   RootAddedCallback root_added_callback_;
 
   ScopedVector<ApplicationImpl> apps_;
-  ViewManagerClientFactory view_manager_client_factory_;
+  scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestApplicationLoader);
 };
 
 }  // namespace
 
 class WindowManagerApiTest : public testing::Test {
  public:
   WindowManagerApiTest() {}
   virtual ~WindowManagerApiTest() {}
@@ skipping 120 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 mojo