[blimp] Add support for having multiple tabs

blimp/client/core/contents/blimp_contents_manager_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_manager.h"
 
 #include "base/memory/ptr_util.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/blimp_contents_impl.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/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)
 
 using testing::_;
 
 namespace {
-const int kDummyTabId = 0;
+const int kDummyBlimpContentsId = 0;
 }
 
 namespace blimp {
 namespace client {
 namespace {
 
 class BlimpContentsManagerTest : public testing::Test {
  public:
   BlimpContentsManagerTest() = default;
 
@@ skipping 48 matching lines @@
   RenderWidgetFeature render_widget_feature;
   MockTabControlFeature tab_control_feature;
 
   BlimpCompositorDependencies compositor_deps(
       base::MakeUnique<MockCompositorDependencies>());
   BlimpContentsManager blimp_contents_manager(&compositor_deps, &ime_feature,
                                               nullptr, &render_widget_feature,
                                               &tab_control_feature);
 
   BlimpContentsImpl* existing_contents =
-      blimp_contents_manager.GetBlimpContents(kDummyTabId);
+      blimp_contents_manager.GetBlimpContents(kDummyBlimpContentsId);
   EXPECT_EQ(nullptr, existing_contents);
 }
 
 TEST_F(BlimpContentsManagerTest, GetDestroyedBlimpContents) {
   base::MessageLoop loop;
   ImeFeature ime_feature;
   RenderWidgetFeature render_widget_feature;
   MockTabControlFeature tab_control_feature;
   BlimpCompositorDependencies compositor_deps(
       base::MakeUnique<MockCompositorDependencies>());
@@ skipping 40 matching lines @@
 
   blimp_contents.reset();
   std::unique_ptr<BlimpContentsImpl> third_blimp_contents =
       blimp_contents_manager.CreateBlimpContents(window_);
   EXPECT_NE(third_blimp_contents, nullptr);
 }
 
 }  // namespace
 }  // namespace client
 }  // namespace blimp