ApplicationConnection lifetime management changes.

components/view_manager/view_manager_service_apptest.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/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/view_manager/ids.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
@@ skipping 60 matching lines @@
 
 bool EmbedUrl(mojo::ApplicationImpl* app,
               ViewManagerService* vm,
               const String& url,
               Id root_id) {
   bool result = false;
   base::RunLoop run_loop;
   {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From(url);
-    ApplicationConnection* connection =
+    scoped_ptr<ApplicationConnection> connection =
         app->ConnectToApplication(request.Pass());
     mojo::ViewManagerClientPtr client;
     connection->ConnectToService(&client);
     vm->Embed(root_id, client.Pass(),
               base::Bind(&BoolResultCallback, &run_loop, &result));
   }
   run_loop.Run();
   return result;
 }
 
@@ skipping 244 matching lines @@
     tracker()->OnEmbed(connection_id, root.Pass());
     if (embed_run_loop_)
       embed_run_loop_->Quit();
   }
   void OnEmbedForDescendant(
       uint32_t view,
       mojo::URLRequestPtr request,
       const OnEmbedForDescendantCallback& callback) override {
     tracker()->OnEmbedForDescendant(view);
     mojo::ViewManagerClientPtr client;
-    ApplicationConnection* connection =
+    scoped_ptr<ApplicationConnection> connection =
         app_->ConnectToApplication(request.Pass());
     connection->ConnectToService(&client);
     callback.Run(client.Pass());
   }
   void OnEmbeddedAppDisconnected(Id view_id) override {
     tracker()->OnEmbeddedAppDisconnected(view_id);
   }
   void OnUnembed() override { tracker()->OnUnembed(); }
   void OnViewBoundsChanged(Id view_id,
                            RectPtr old_bounds,
@@ skipping 198 matching lines @@
     return client.Pass();
   }
 
   // ApplicationTestBase:
   ApplicationDelegate* GetApplicationDelegate() override { return this; }
   void SetUp() override {
     ApplicationTestBase::SetUp();
     client_factory_.reset(new ViewManagerClientFactory(application_impl()));
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:view_manager");
-    ApplicationConnection* vm_connection =
+    scoped_ptr<ApplicationConnection> vm_connection =
         application_impl()->ConnectToApplication(request.Pass());
     vm_connection->AddService(client_factory_.get());
     vm_connection->ConnectToService(&view_manager_root_);
     vm_client1_ = client_factory_->WaitForInstance();
     ASSERT_TRUE(vm_client1_);
     // Next we should get an embed call on the "window manager" client.
     vm_client1_->WaitForIncomingMethodCall();
     ASSERT_EQ(1u, changes1()->size());
     EXPECT_EQ(CHANGE_TYPE_EMBED, (*changes1())[0].type);
     // All these tests assume 1 for the client id. The only real assertion here
@@ skipping 1127 matching lines @@
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdViews/AddView and the like don't result in messages to the
 // originating connection.
 
 // TODO(sky): make sure coverage of what was
 // ViewManagerTest.SecondEmbedRoot_InitService and
 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager
 // tests.
 
 }  // namespace view_manager