Mandoline: Move ContentHandlerConnection into separate file

mojo/shell/shell_impl.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 "mojo/shell/shell_impl.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 52 matching lines @@
 
 // Shell implementation:
 void ShellImpl::ConnectToApplication(mojo::URLRequestPtr app_request,
                                      InterfaceRequest<ServiceProvider> services,
                                      ServiceProviderPtr exposed_services) {
   GURL app_gurl(app_request->url.To<std::string>());
   if (!app_gurl.is_valid()) {
     LOG(ERROR) << "Error: invalid URL: " << app_request;
     return;
   }
-  manager_->ConnectToApplication(app_request.Pass(), identity_.url,
-                                 services.Pass(), exposed_services.Pass(),
-                                 base::Closure());
+  manager_->ConnectToApplication(app_request.Pass(), std::string(),
+                                 identity_.url, services.Pass(),
+                                 exposed_services.Pass(), base::Closure());
 }
 
 void ShellImpl::QuitApplication() {
   queue_requests_ = true;
   application_->OnQuitRequested(base::Bind(&ShellImpl::OnQuitRequestedResult,
                                            base::Unretained(this)));
 }
 
 void ShellImpl::OnConnectionError() {
   std::vector<QueuedClientRequest*> queued_client_requests;
   queued_client_requests_.swap(queued_client_requests);
   auto manager = manager_;
   manager_->OnShellImplError(this);
   //|this| is deleted.
 
   // If any queued requests came to shell during time it was shutting down,
   // start them now.
   for (auto request : queued_client_requests) {
     mojo::URLRequestPtr url(mojo::URLRequest::New());
     url->url = mojo::String::From(request->requested_url.spec());
-    manager->ConnectToApplication(url.Pass(), request->requestor_url,
+    manager->ConnectToApplication(url.Pass(), std::string(),
+                                  request->requestor_url,
                                   request->services.Pass(),
                                   request->exposed_services.Pass(),
                                   base::Closure());
   }
   STLDeleteElements(&queued_client_requests);
 }
 
 void ShellImpl::OnQuitRequestedResult(bool can_quit) {
   if (can_quit)
     return;
 
   queue_requests_ = false;
   for (auto request : queued_client_requests_) {
     application_->AcceptConnection(request->requestor_url.spec(),
                                    request->services.Pass(),
                                    request->exposed_services.Pass(),
                                    request->requested_url.spec());
   }
   STLDeleteElements(&queued_client_requests_);
 }
 
 }  // namespace shell
 }  // namespace mojo