Revert of Move content's shell connections to the IO thread

services/navigation/view_impl.cc

 // Copyright 2016 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 "services/navigation/view_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
-#include "services/shell/public/cpp/connector.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 namespace navigation {
 namespace {
 
 class InterstitialPageDelegate : public content::InterstitialPageDelegate {
@@ skipping 21 matching lines @@
   mojom::NavigationEntryPtr entry_ptr(mojom::NavigationEntry::New());
   entry_ptr->id = entry.GetUniqueID();
   entry_ptr->url = entry.GetURL();
   entry_ptr->title = base::UTF16ToUTF8(entry.GetTitle());
   entry_ptr->redirect_chain = entry.GetRedirectChain();
   return entry_ptr;
 }
 
 }  // namespace
 
-ViewImpl::ViewImpl(std::unique_ptr<shell::Connector> connector,
+ViewImpl::ViewImpl(shell::Connector* connector,
                    const std::string& client_user_id,
                    mojom::ViewClientPtr client,
                    mojom::ViewRequest request,
                    std::unique_ptr<shell::ServiceContextRef> ref)
-    : connector_(std::move(connector)),
+    : connector_(connector),
       binding_(this, std::move(request)),
       client_(std::move(client)),
       ref_(std::move(ref)),
       web_view_(new views::WebView(
           content::BrowserContext::GetBrowserContextForShellUserId(
               client_user_id))) {
   web_view_->GetWebContents()->SetDelegate(this);
   const content::NavigationController* controller =
       &web_view_->GetWebContents()->GetController();
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
@@ skipping 66 matching lines @@
                               bool* was_blocked) {
   mojom::ViewClientPtr client;
   mojom::ViewPtr view;
   mojom::ViewRequest view_request = GetProxy(&view);
   client_->ViewCreated(std::move(view), GetProxy(&client),
                        disposition == NEW_POPUP, initial_rect, user_gesture);
 
   const std::string new_user_id =
       content::BrowserContext::GetShellUserIdFor(
           new_contents->GetBrowserContext());
-  ViewImpl* impl = new ViewImpl(
-      connector_->Clone(), new_user_id, std::move(client),
-      std::move(view_request), ref_->Clone());
+  ViewImpl* impl = new ViewImpl(connector_, new_user_id, std::move(client),
+                                std::move(view_request), ref_->Clone());
   // TODO(beng): This is a bit crappy. should be able to create the ViewImpl
   //             with |new_contents| instead.
   impl->web_view_->SetWebContents(new_contents);
   impl->web_view_->GetWebContents()->SetDelegate(impl);
 
   // TODO(beng): this reply is currently synchronous, figure out a fix.
   if (was_blocked)
     *was_blocked = false;
 }
 
@@ skipping 102 matching lines @@
 }
 
 void ViewImpl::OnEmbed(ui::Window* root) {
   DCHECK(!widget_.get());
   widget_.reset(new views::Widget);
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = this;
   params.native_widget = new views::NativeWidgetMus(
-      widget_.get(), connector_.get(), root, ui::mojom::SurfaceType::DEFAULT);
+      widget_.get(), connector_, root, ui::mojom::SurfaceType::DEFAULT);
   widget_->Init(params);
   widget_->Show();
 }
 
 void ViewImpl::OnDidDestroyClient(ui::WindowTreeClient* client) {}
 void ViewImpl::OnEventObserved(const ui::Event& event, ui::Window* target) {}
 
 views::View* ViewImpl::GetContentsView() {
   return web_view_;
 }
 
 views::Widget* ViewImpl::GetWidget() {
   return web_view_->GetWidget();
 }
 
 const views::Widget* ViewImpl::GetWidget() const {
   return web_view_->GetWidget();
 }
 
 }  // navigation