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

services/navigation/view_impl.cc

Index: services/navigation/view_impl.cc
diff --git a/services/navigation/view_impl.cc b/services/navigation/view_impl.cc
index a550d7a1e0cb2670cabc69616e7bd79ff70b8ec9..8d8af6af8d870bd0ac9b50a9bdcb17bda8b67d77 100644
--- a/services/navigation/view_impl.cc
+++ b/services/navigation/view_impl.cc
@@ -15,7 +15,6 @@
 #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"
@@ -57,12 +56,12 @@
 
 }  // 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::ShellConnectionRef> ref)
-    : connector_(std::move(connector)),
+    : connector_(connector),
       binding_(this, std::move(request)),
       client_(std::move(client)),
       ref_(std::move(ref)),
@@ -149,9 +148,8 @@
   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);
@@ -274,7 +272,7 @@
   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();
 }