Migrate TabControlFeature from 0.5 to 0.6

blimp/client/core/contents/blimp_contents_impl_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/core/contents/blimp_contents_impl.h"
 
 #include "base/message_loop/message_loop.h"
 #include "blimp/client/core/contents/blimp_contents_impl.h"
 #include "blimp/client/core/contents/fake_navigation_feature.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blimp {
 namespace client {
 namespace {
 
 const char kExampleURL[] = "https://www.example.com/";
 const char kOtherExampleURL[] = "https://www.otherexample.com/";
+const int kDummyTabId = 0;
 
 class MockBlimpContentsObserver : public BlimpContentsObserver {
  public:
-  MockBlimpContentsObserver() = default;
+  explicit MockBlimpContentsObserver(BlimpContents* blimp_contents)
+      : BlimpContentsObserver(blimp_contents) {}
   ~MockBlimpContentsObserver() override = default;
 
   MOCK_METHOD0(OnNavigationStateChanged, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockBlimpContentsObserver);
 };
 
 TEST(BlimpContentsImplTest, LoadURLAndNotifyObservers) {
   base::MessageLoop loop;
-  BlimpContentsImpl blimp_contents;
+  BlimpContentsImpl blimp_contents{kDummyTabId};

[nyquist, 2016/08/05 23:03:23]

I think we often use just () for constructors. Is this intentional?

[Menglin, 2016/08/06 00:57:00]

use () instead

 
   BlimpNavigationControllerImpl& navigation_controller =
       blimp_contents.GetNavigationController();
   FakeNavigationFeature feature;
   feature.SetDelegate(1, &navigation_controller);
   navigation_controller.SetNavigationFeatureForTesting(&feature);
 
-  testing::StrictMock<MockBlimpContentsObserver> observer1;
-  blimp_contents.AddObserver(&observer1);
-  testing::StrictMock<MockBlimpContentsObserver> observer2;
-  blimp_contents.AddObserver(&observer2);
+  testing::StrictMock<MockBlimpContentsObserver> observer1(&blimp_contents);
+  testing::StrictMock<MockBlimpContentsObserver> observer2(&blimp_contents);
 
   EXPECT_CALL(observer1, OnNavigationStateChanged());
   EXPECT_CALL(observer2, OnNavigationStateChanged()).Times(2);
 
   navigation_controller.LoadURL(GURL(kExampleURL));
   loop.RunUntilIdle();
 
   EXPECT_EQ(kExampleURL, navigation_controller.GetURL().spec());
 
   // Observer should no longer receive callbacks.
   blimp_contents.RemoveObserver(&observer1);
 
   navigation_controller.LoadURL(GURL(kOtherExampleURL));
   loop.RunUntilIdle();
 
   EXPECT_EQ(kOtherExampleURL, navigation_controller.GetURL().spec());
 }
 
 }  // namespace
 }  // namespace client
 }  // namespace blimp