Added features to BlimpClientContext and BlimpContents

blimp/client/core/blimp_client_context_impl.cc

Index: blimp/client/core/blimp_client_context_impl.cc
diff --git a/blimp/client/core/blimp_client_context_impl.cc b/blimp/client/core/blimp_client_context_impl.cc
index 289602adc22ae098e17f0cd8f963513e88c38b07..e89d66c23321dafb19f188d04614b4219f29ba32 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/blimp_client_context_impl.cc
@@ -10,6 +10,8 @@
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "blimp/client/core/contents/blimp_contents_impl.h"
 #include "blimp/client/core/contents/blimp_contents_manager.h"
+#include "blimp/client/core/contents/ime_feature.h"
+#include "blimp/client/core/contents/navigation_feature.h"
 #include "blimp/client/core/session/cross_thread_network_event_observer.h"
 #include "blimp/client/public/blimp_client_context_delegate.h"
 
@@ -49,6 +51,8 @@ BlimpClientContextImpl::BlimpClientContextImpl(
       io_thread_task_runner_(io_thread_task_runner),
       file_thread_task_runner_(file_thread_task_runner),
       blimp_contents_manager_(new BlimpContentsManager),
+      navigation_feature_(new NavigationFeature),
+      ime_feature_(new ImeFeature),
       weak_factory_(this) {
   blimp_connection_statistics_ = new BlimpConnectionStatistics();
   net_components_.reset(new ClientNetworkComponents(
@@ -77,8 +81,9 @@ void BlimpClientContextImpl::SetDelegate(BlimpClientContextDelegate* delegate) {
 }
 
 std::unique_ptr<BlimpContents> BlimpClientContextImpl::CreateBlimpContents() {
-  std::unique_ptr<BlimpContents> blimp_contents =
-      blimp_contents_manager_->CreateBlimpContents();
+  std::unique_ptr<BlimpContentsImpl> blimp_contents =
+      blimp_contents_manager_->CreateBlimpContents(navigation_feature_.get(),
+                                                   ime_feature_.get());
   delegate_->AttachBlimpContentsHelpers(blimp_contents.get());
   return blimp_contents;
 }