[blimp] Add support for having multiple tabs

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 "base/run_loop.h"
 #include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
 #include "blimp/client/core/contents/fake_navigation_feature.h"
 #include "blimp/client/core/contents/ime_feature.h"
 #include "blimp/client/core/contents/tab_control_feature.h"
 #include "blimp/client/core/render_widget/render_widget_feature.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
 #include "blimp/client/support/compositor/mock_compositor_dependencies.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_ANDROID)
 #include "ui/android/window_android.h"
 #endif  // defined(OS_ANDROID)
 
 namespace blimp {
 namespace client {
 namespace {
 
 const char kExampleURL[] = "https://www.example.com/";
 const char kOtherExampleURL[] = "https://www.otherexample.com/";
-const int kDummyTabId = 0;
+const int kDummyBlimpContentsId = 0;
 
 class MockBlimpContentsObserver : public BlimpContentsObserver {
  public:
   explicit MockBlimpContentsObserver(BlimpContents* blimp_contents)
       : BlimpContentsObserver(blimp_contents) {}
   ~MockBlimpContentsObserver() override = default;
 
   MOCK_METHOD0(OnNavigationStateChanged, void());
 
  private:
@@ skipping 27 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(BlimpContentsImplTest);
 };
 
 TEST_F(BlimpContentsImplTest, LoadURLAndNotifyObservers) {
   base::MessageLoop loop;
   ImeFeature ime_feature;
   FakeNavigationFeature navigation_feature;
   RenderWidgetFeature render_widget_feature;
   BlimpCompositorDependencies compositor_deps(
       base::MakeUnique<MockCompositorDependencies>());
-  BlimpContentsImpl blimp_contents(kDummyTabId, window_, &compositor_deps,
-                                   &ime_feature, &navigation_feature,
-                                   &render_widget_feature, nullptr);
+  BlimpContentsImpl blimp_contents(
+      kDummyBlimpContentsId, window_, &compositor_deps, &ime_feature,
+      &navigation_feature, &render_widget_feature, nullptr);
 
   BlimpNavigationControllerImpl& navigation_controller =
       blimp_contents.GetNavigationController();
 
   testing::StrictMock<MockBlimpContentsObserver> observer1(&blimp_contents);
   testing::StrictMock<MockBlimpContentsObserver> observer2(&blimp_contents);
 
   EXPECT_CALL(observer1, OnNavigationStateChanged());
   EXPECT_CALL(observer2, OnNavigationStateChanged()).Times(2);
 
@@ skipping 16 matching lines @@
   int height = 15;
   float dp_to_px = 1.23f;
 
   ImeFeature ime_feature;
   RenderWidgetFeature render_widget_feature;
   MockTabControlFeature tab_control_feature;
   base::MessageLoop loop;
   BlimpCompositorDependencies compositor_deps(
       base::MakeUnique<MockCompositorDependencies>());
   BlimpContentsImpl blimp_contents(
-      kDummyTabId, window_, &compositor_deps, &ime_feature, nullptr,
+      kDummyBlimpContentsId, window_, &compositor_deps, &ime_feature, nullptr,
       &render_widget_feature, &tab_control_feature);
 
   EXPECT_CALL(tab_control_feature,
               SetSizeAndScale(gfx::Size(width, height), dp_to_px)).Times(1);
 
   blimp_contents.SetSizeAndScale(gfx::Size(width, height), dp_to_px);
 }
 
 }  // namespace
 }  // namespace client
 }  // namespace blimp