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

services/navigation/view_impl.h

 // 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.
 
 #ifndef SERVICES_NAVIGATION_VIEW_IMPL_H_
 #define SERVICES_NAVIGATION_VIEW_IMPL_H_
 
-#include <memory>
-
 #include "base/macros.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/navigation/public/interfaces/view.mojom.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/service_context_ref.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace views {
 class WebView;
 class Widget;
 }
 
 namespace navigation {
 
 class ViewImpl : public mojom::View,
                  public content::WebContentsDelegate,
                  public content::NotificationObserver,
                  public ui::WindowTreeClientDelegate,
                  public views::WidgetDelegate {
  public:
-  ViewImpl(std::unique_ptr<shell::Connector> connector,
+  ViewImpl(shell::Connector* connector,
            const std::string& client_user_id,
            mojom::ViewClientPtr client,
            mojom::ViewRequest request,
            std::unique_ptr<shell::ServiceContextRef> ref);
   ~ViewImpl() override;
 
  private:
   // mojom::View:
   void NavigateTo(const GURL& url) override;
   void GoBack() override;
@@ skipping 34 matching lines @@
   // ui::WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override;
   void OnDidDestroyClient(ui::WindowTreeClient* client) override;
   void OnEventObserved(const ui::Event& event, ui::Window* target) override;
 
   // views::WidgetDelegate:
   views::View* GetContentsView() override;
   views::Widget* GetWidget() override;
   const views::Widget* GetWidget() const override;
 
-  std::unique_ptr<shell::Connector> connector_;
+  shell::Connector* connector_;
   mojo::StrongBinding<mojom::View> binding_;
   mojom::ViewClientPtr client_;
   std::unique_ptr<shell::ServiceContextRef> ref_;
 
   views::WebView* web_view_;
 
   std::unique_ptr<content::WebContents> web_contents_;
 
   content::NotificationRegistrar registrar_;
 
   std::unique_ptr<views::Widget> widget_;
 
   gfx::Size resizer_size_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewImpl);
 };
 
 }  // navigation
 
 #endif  // SERVICES_NAVIGATION_VIEW_IMPL_H_