Move remaining Blimp feature code to core.

blimp/client/core/contents/blimp_contents_manager.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 "blimp/client/core/contents/blimp_contents_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
+#include "blimp/client/core/contents/blimp_contents_impl.h"
+#include "blimp/client/core/contents/navigation_feature.h"
 #include "blimp/client/core/contents/tab_control_feature.h"
+#include "blimp/client/core/render_widget/render_widget_feature.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
 
 namespace {
 const int kDummyTabId = 0;
 }
 
 namespace blimp {
 namespace client {
 
 class BlimpContentsManager::BlimpContentsDeletionObserver
@@ skipping 17 matching lines @@
     : BlimpContentsObserver(blimp_contents),
       blimp_contents_manager_(blimp_contents_manager) {}
 
 void BlimpContentsManager::BlimpContentsDeletionObserver::
     OnContentsDestroyed() {
   BlimpContents* contents = blimp_contents();
   blimp_contents_manager_->OnContentsDestroyed(contents);
 }
 
 BlimpContentsManager::BlimpContentsManager(
+    BlimpCompositorDependencies* blimp_compositor_dependencies,
     ImeFeature* ime_feature,
     NavigationFeature* nav_feature,
+    RenderWidgetFeature* render_widget_feature,
     TabControlFeature* tab_control_feature)
-    : ime_feature_(ime_feature),
+    : blimp_compositor_dependencies_(blimp_compositor_dependencies),
+      ime_feature_(ime_feature),
       navigation_feature_(nav_feature),
+      render_widget_feature_(render_widget_feature),
       tab_control_feature_(tab_control_feature),
       weak_ptr_factory_(this) {}
 
 BlimpContentsManager::~BlimpContentsManager() {}
 
 std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents() {
   int id = CreateBlimpContentsId();
 
   std::unique_ptr<BlimpContentsImpl> new_contents =
-      base::MakeUnique<BlimpContentsImpl>(id, ime_feature_, navigation_feature_,
-                                          tab_control_feature_);
+      base::MakeUnique<BlimpContentsImpl>(
+          id, blimp_compositor_dependencies_, ime_feature_, navigation_feature_,
+          render_widget_feature_, tab_control_feature_);
 
   // Create an observer entry for the contents.
   std::unique_ptr<BlimpContentsDeletionObserver> observer =
       base::MakeUnique<BlimpContentsDeletionObserver>(this, new_contents.get());
   observer_map_.insert(
       std::pair<int, std::unique_ptr<BlimpContentsDeletionObserver>>(
           id, std::move(observer)));
 
   // Notifies the engine that we've created a new BlimpContents.
   tab_control_feature_->CreateTab(id);
@@ skipping 37 matching lines @@
       FROM_HERE, base::Bind(&BlimpContentsManager::EraseObserverFromMap,
                             this->GetWeakPtr(), id));
 }
 
 base::WeakPtr<BlimpContentsManager> BlimpContentsManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace client
 }  // namespace blimp