ApplicationConnection lifetime management changes.

mandoline/ui/browser/browser.cc

 // Copyright 2015 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 "mandoline/ui/browser/browser.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager_init.h"
@@ skipping 99 matching lines @@
 }
 
 void Browser::OnEmbedForDescendant(mojo::View* view,
                                    mojo::URLRequestPtr request,
                                    mojo::ViewManagerClientPtr* client) {
   // TODO(sky): move this to Frame/FrameTree.
   Frame* frame = Frame::FindFirstFrameAncestor(view);
   if (!frame || !frame->HasAncestor(frame_tree_->root())) {
     // TODO(sky): add requestor url so that we can return false if it's not
     // an app we expect.
-    mojo::ApplicationConnection* connection =
+    scoped_ptr<mojo::ApplicationConnection> connection =
         app_->ConnectToApplication(request.Pass());
     connection->ConnectToService(client);
     return;
   }
 
   scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
   frame_connection->Init(app_, request.Pass(), client);
   FrameTreeClient* frame_tree_client = frame_connection->frame_tree_client();
   frame_tree_->CreateOrReplaceFrame(frame, view, frame_tree_client,
                                     frame_connection.Pass());
@@ skipping 77 matching lines @@
   view_embedder_bindings_.AddBinding(this, request.Pass());
 }
 
 void Browser::ShowOmnibox(mojo::URLRequestPtr request) {
   if (!omnibox_) {
     omnibox_ = root_->view_manager()->CreateView();
     root_->AddChild(omnibox_);
     omnibox_->SetBounds(root_->bounds());
   }
   mojo::ViewManagerClientPtr view_manager_client;
-  mojo::ApplicationConnection* connection =
+  scoped_ptr<mojo::ApplicationConnection> connection =
       app_->ConnectToApplication(request.Pass());
   connection->AddService<ViewEmbedder>(this);
   connection->ConnectToService(&view_manager_client);
   omnibox_->Embed(view_manager_client.Pass());
   omnibox_->SetVisible(true);
 }
 
 void Browser::RequestNavigate(Frame* source,
                               NavigationTargetType target_type,
                               Frame* target_frame,
                               mojo::URLRequestPtr request) {
   // TODO: this needs security checks.
   if (target_type == NAVIGATION_TARGET_TYPE_EXISTING_FRAME) {
     if (target_frame && target_frame != frame_tree_->root() &&
         target_frame->view()) {
       NavigateExistingFrame(target_frame, request.Pass());
       return;
     }
     DVLOG(1) << "RequestNavigate() targeted existing frame that doesn't exist.";
     return;
   }
   ReplaceContentWithRequest(request.Pass());
 }
 
 }  // namespace mandoline