Added features to BlimpClientContext and BlimpContents

blimp/client/core/contents/blimp_contents_impl.h

Index: blimp/client/core/contents/blimp_contents_impl.h
diff --git a/blimp/client/core/contents/blimp_contents_impl.h b/blimp/client/core/contents/blimp_contents_impl.h
index c08f441a27bc696ffe3064c90ed2cbebbc5a4528..e8b4a6bde29391dca219c174a8bccacd553aaa5b 100644
--- a/blimp/client/core/contents/blimp_contents_impl.h
+++ b/blimp/client/core/contents/blimp_contents_impl.h
@@ -26,12 +26,18 @@ class BlimpContentsImplAndroid;
 
 class BlimpContentsObserver;
 class BlimpNavigationController;
+class ImeFeature;
+class NavigationFeature;
 class TabControlFeature;
 
 class BlimpContentsImpl : public BlimpContents,
                           public BlimpNavigationControllerDelegate {
  public:
-  explicit BlimpContentsImpl(int id, TabControlFeature* tab_control_feature);
+  // Ownership of the features remains with the caller.
+  explicit BlimpContentsImpl(int id,
+                             ImeFeature* ime_feature,
+                             NavigationFeature* navigation_feature,
+                             TabControlFeature* tab_control_feature);
   ~BlimpContentsImpl() override;
 
 #if defined(OS_ANDROID)