Added features to BlimpClientContext and BlimpContents

blimp/client/core/blimp_client_context_impl.h

Index: blimp/client/core/blimp_client_context_impl.h
diff --git a/blimp/client/core/blimp_client_context_impl.h b/blimp/client/core/blimp_client_context_impl.h
index dfc184bb8da929436f069398de4935e5f445b9fc..da77106950281cbc92cdacd2adc68245ddbc27a4 100644
--- a/blimp/client/core/blimp_client_context_impl.h
+++ b/blimp/client/core/blimp_client_context_impl.h
@@ -25,6 +25,8 @@ namespace blimp {
 namespace client {
 
 class BlimpContentsManager;
+class ImeFeature;
+class NavigationFeature;
 
 // BlimpClientContextImpl is the implementation of the main context-class for
 // the blimp client.
@@ -85,6 +87,10 @@ class BlimpClientContextImpl : public BlimpClientContext,
 
   std::unique_ptr<ThreadPipeManager> thread_pipe_manager_;
 
+  // Features to handle all incoming and outgoing protobuf messages.
+  std::unique_ptr<NavigationFeature> navigation_feature_;
+  std::unique_ptr<ImeFeature> ime_feature_;
+
   base::WeakPtrFactory<BlimpClientContextImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpClientContextImpl);