Added features to BlimpClientContext and BlimpContents

blimp/client/core/contents/blimp_contents_manager.cc

Index: blimp/client/core/contents/blimp_contents_manager.cc
diff --git a/blimp/client/core/contents/blimp_contents_manager.cc b/blimp/client/core/contents/blimp_contents_manager.cc
index e70a41b77b32e8f66559d37b8a8b19442ec4dc3c..e93a018e574ce3eb0f6430315bade477052fe9d1 100644
--- a/blimp/client/core/contents/blimp_contents_manager.cc
+++ b/blimp/client/core/contents/blimp_contents_manager.cc
@@ -45,8 +45,12 @@ void BlimpContentsManager::BlimpContentsDeletionObserver::
 }
 
 BlimpContentsManager::BlimpContentsManager(
+    ImeFeature* ime_feature,
+    NavigationFeature* nav_feature,
     TabControlFeature* tab_control_feature)
-    : tab_control_feature_(tab_control_feature),
+    : ime_feature_(ime_feature),
+      navigation_feature_(nav_feature),
+      tab_control_feature_(tab_control_feature),
       weak_ptr_factory_(this) {}
 
 BlimpContentsManager::~BlimpContentsManager() {}
@@ -55,7 +59,8 @@ std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents() {
   int id = CreateBlimpContentsId();
 
   std::unique_ptr<BlimpContentsImpl> new_contents =
-      base::MakeUnique<BlimpContentsImpl>(id, tab_control_feature_);
+      base::MakeUnique<BlimpContentsImpl>(id, ime_feature_, navigation_feature_,
+                                          tab_control_feature_);
 
   // Create an observer entry for the contents.
   std::unique_ptr<BlimpContentsDeletionObserver> observer =