Migrate TabControlFeature from 0.5 to 0.6

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 115fd075678d20dca13bda6318348a8395742519..9b264744e231daf613a62a38f3e07048f2ed1eaf 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/blimp_client_context_impl.cc
@@ -7,6 +7,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 #include "blimp/client/core/contents/blimp_contents_impl.h"
+#include "blimp/client/core/contents/blimp_contents_manager.h"
 #include "blimp/client/public/blimp_client_context_delegate.h"
 
 #if defined(OS_ANDROID)
@@ -33,7 +34,8 @@ BlimpClientContext* BlimpClientContext::Create() {
   return new BlimpClientContextImpl();
 }
 
-BlimpClientContextImpl::BlimpClientContextImpl() : BlimpClientContext() {}
+BlimpClientContextImpl::BlimpClientContextImpl()
+    : BlimpClientContext(), blimp_contents_manager_(new BlimpContentsManager) {}
 
 BlimpClientContextImpl::~BlimpClientContextImpl() {}
 
@@ -66,7 +68,7 @@ void BlimpClientContextImpl::SetDelegate(BlimpClientContextDelegate* delegate) {
 
 std::unique_ptr<BlimpContents> BlimpClientContextImpl::CreateBlimpContents() {
   std::unique_ptr<BlimpContents> blimp_contents =
-      base::WrapUnique(new BlimpContentsImpl);
+      blimp_contents_manager_->CreateBlimpContents();
   delegate_->AttachBlimpContentsHelpers(blimp_contents.get());
   return blimp_contents;
 }