Add BlimpView to a Chrome tab when Blimp is enabled.

blimp/client/core/contents/blimp_contents_observer_unittest.cc

Index: blimp/client/core/contents/blimp_contents_observer_unittest.cc
diff --git a/blimp/client/core/contents/blimp_contents_observer_unittest.cc b/blimp/client/core/contents/blimp_contents_observer_unittest.cc
index cea0d026b7b2764360ebd951a6adfb007e6b7f9d..527ffb268c9061d58ff1caedea65a63f410512b6 100644
--- a/blimp/client/core/contents/blimp_contents_observer_unittest.cc
+++ b/blimp/client/core/contents/blimp_contents_observer_unittest.cc
@@ -11,6 +11,11 @@
 #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 {
 const int kDummyTabId = 0;
@@ -21,26 +26,43 @@ namespace client {
 
 namespace {
 
-class BlimpContentsObserverTest : public BlimpContentsObserver {
+class TestBlimpContentsObserver : public BlimpContentsObserver {
  public:
-  explicit BlimpContentsObserverTest(BlimpContents* blimp_contents)
+  explicit TestBlimpContentsObserver(BlimpContents* blimp_contents)
       : BlimpContentsObserver(blimp_contents) {}
 
   MOCK_METHOD0(OnContentsDestroyed, void());
 
  private:
+  DISALLOW_COPY_AND_ASSIGN(TestBlimpContentsObserver);
+};
+
+class BlimpContentsObserverTest : public testing::Test {
+ public:
+  BlimpContentsObserverTest() = default;
+
+#if defined(OS_ANDROID)
+  void SetUp() override { window_ = ui::WindowAndroid::CreateForTesting(); }
+
+  void TearDown() override { window_->DestroyForTesting(); }
+#endif  // defined(OS_ANDROID)
+
+ protected:
+  gfx::NativeWindow window_ = nullptr;
+
+ private:
   DISALLOW_COPY_AND_ASSIGN(BlimpContentsObserverTest);
 };
 
-TEST(BlimpContentsObserverUnittests, ObserverDies) {
+TEST_F(BlimpContentsObserverTest, ObserverDies) {
   RenderWidgetFeature render_widget_feature;
   BlimpCompositorDependencies compositor_deps(
       base::MakeUnique<MockCompositorDependencies>());
-  BlimpContentsImpl contents(kDummyTabId, &compositor_deps, nullptr, nullptr,
-                             &render_widget_feature, nullptr);
+  BlimpContentsImpl contents(kDummyTabId, window_, &compositor_deps, nullptr,
+                             nullptr, &render_widget_feature, nullptr);
 
   std::unique_ptr<BlimpContentsObserver> observer =
-      base::MakeUnique<BlimpContentsObserverTest>(&contents);
+      base::MakeUnique<TestBlimpContentsObserver>(&contents);
   BlimpContentsObserver* observer_ptr = observer.get();
   EXPECT_TRUE(contents.HasObserver(observer_ptr));
   observer.reset();
@@ -48,16 +70,16 @@ TEST(BlimpContentsObserverUnittests, ObserverDies) {
   EXPECT_FALSE(contents.HasObserver(observer_ptr));
 }
 
-TEST(BlimpContentsObserverUnittests, ContentsDies) {
-  std::unique_ptr<BlimpContentsObserverTest> observer;
+TEST_F(BlimpContentsObserverTest, ContentsDies) {
+  std::unique_ptr<TestBlimpContentsObserver> observer;
   RenderWidgetFeature render_widget_feature;
   BlimpCompositorDependencies compositor_deps(
       base::MakeUnique<MockCompositorDependencies>());
   std::unique_ptr<BlimpContentsImpl> contents =
-      base::MakeUnique<BlimpContentsImpl>(kDummyTabId, &compositor_deps,
-                                          nullptr, nullptr,
+      base::MakeUnique<BlimpContentsImpl>(kDummyTabId, window_,
+                                          &compositor_deps, nullptr, nullptr,
                                           &render_widget_feature, nullptr);
-  observer.reset(new BlimpContentsObserverTest(contents.get()));
+  observer.reset(new TestBlimpContentsObserver(contents.get()));
   EXPECT_CALL(*observer, OnContentsDestroyed()).Times(1);
   EXPECT_EQ(observer->blimp_contents(), contents.get());
   contents.reset();