Added features to BlimpClientContext and BlimpContents

blimp/client/core/contents/blimp_contents_impl_unittest.cc

Index: blimp/client/core/contents/blimp_contents_impl_unittest.cc
diff --git a/blimp/client/core/contents/blimp_contents_impl_unittest.cc b/blimp/client/core/contents/blimp_contents_impl_unittest.cc
index 5ae6f818eafdf84f437f31e50575dad6739af172..dede75004e3a631ffa1e2bd0efde67cb257158a2 100644
--- a/blimp/client/core/contents/blimp_contents_impl_unittest.cc
+++ b/blimp/client/core/contents/blimp_contents_impl_unittest.cc
@@ -43,13 +43,11 @@ class MockTabControlFeature : public TabControlFeature {
 
 TEST(BlimpContentsImplTest, LoadURLAndNotifyObservers) {
   base::MessageLoop loop;
-  BlimpContentsImpl blimp_contents(kDummyTabId, nullptr);
+  FakeNavigationFeature feature;
+  BlimpContentsImpl blimp_contents(kDummyTabId, nullptr, &feature, nullptr);
 
   BlimpNavigationControllerImpl& navigation_controller =
       blimp_contents.GetNavigationController();
-  FakeNavigationFeature feature;
-  feature.SetDelegate(1, &navigation_controller);
-  navigation_controller.SetNavigationFeatureForTesting(&feature);
 
   testing::StrictMock<MockBlimpContentsObserver> observer1(&blimp_contents);
   testing::StrictMock<MockBlimpContentsObserver> observer2(&blimp_contents);
@@ -78,7 +76,8 @@ TEST(BlimpContentsImplTest, SetSizeAndScaleThroughTabControlFeature) {
 
   MockTabControlFeature tab_control_feature;
   base::MessageLoop loop;
-  BlimpContentsImpl blimp_contents(kDummyTabId, &tab_control_feature);
+  BlimpContentsImpl blimp_contents(kDummyTabId, nullptr, nullptr,
+                                   &tab_control_feature);
 
   EXPECT_CALL(tab_control_feature,
               SetSizeAndScale(gfx::Size(width, height), dp_to_px)).Times(1);