Added features to BlimpClientContext and BlimpContents

blimp/client/core/contents/blimp_contents_manager.h

Index: blimp/client/core/contents/blimp_contents_manager.h
diff --git a/blimp/client/core/contents/blimp_contents_manager.h b/blimp/client/core/contents/blimp_contents_manager.h
index 77f1bfd4ed804bbbc110671c66e846c0f80f6018..9b58e76186bb9cd19145a2b6161ca04b2639c05f 100644
--- a/blimp/client/core/contents/blimp_contents_manager.h
+++ b/blimp/client/core/contents/blimp_contents_manager.h
@@ -17,7 +17,9 @@ class TabControlFeature;
 // monitor the life time of the contents it creates.
 class BlimpContentsManager {
  public:
-  explicit BlimpContentsManager(TabControlFeature* tab_control_feature);
+  explicit BlimpContentsManager(ImeFeature* ime_feature,
+                                NavigationFeature* nav_feature,
+                                TabControlFeature* tab_control_feature);
   ~BlimpContentsManager();
 
   // Builds a BlimpContentsImpl and notifies the engine.
@@ -49,7 +51,9 @@ class BlimpContentsManager {
   // lifetime of the observers.
   std::map<int, std::unique_ptr<BlimpContentsDeletionObserver>> observer_map_;
 
-  TabControlFeature* tab_control_feature_ = nullptr;
+  ImeFeature* ime_feature_;
+  NavigationFeature* navigation_feature_;
+  TabControlFeature* tab_control_feature_;
 
   base::WeakPtrFactory<BlimpContentsManager> weak_ptr_factory_;