Convert OneClickSigninBubbleViewTest to browser_tests.

chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc

Index: chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc
diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc
similarity index 85%
rename from chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc
rename to chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc
index ce46b65c03b433276668af9c121d04c04627d31b..849ba2f15b28ac3e386ef74247ba10214ef0d261 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc
+++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc
@@ -7,40 +7,28 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/toolbar_view.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/common/page_transition_types.h"
 #include "ui/views/controls/button/label_button.h"
-#include "ui/views/test/views_test_base.h"
-#include "ui/views/widget/widget.h"
 
-class OneClickSigninBubbleViewTest : public views::ViewsTestBase {
+class OneClickSigninBubbleViewTest : public InProcessBrowserTest {
  public:
   OneClickSigninBubbleViewTest()
       : on_start_sync_called_(false),
         mode_(OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST),
         bubble_learn_more_click_count_(0),
         dialog_learn_more_click_count_(0),
-        advanced_click_count_(0),
-        anchor_widget_(NULL) {
+        advanced_click_count_(0) {
   }
 
-  virtual void SetUp() OVERRIDE {
-    views::ViewsTestBase::SetUp();
-
-    // Create a widget to host the anchor view.
-    anchor_widget_ = new views::Widget;
-    views::Widget::InitParams widget_params = CreateParams(
-        views::Widget::InitParams::TYPE_WINDOW);
-    anchor_widget_->Init(widget_params);
-    anchor_widget_->Show();
-  }
-
-  virtual void TearDown() OVERRIDE {
-    OneClickSigninBubbleView::Hide();
-    anchor_widget_->Close();
-    anchor_widget_ = NULL;
-    views::ViewsTestBase::TearDown();
+  // InProcessBrowserTest:
+  virtual void SetUpOnMainThread() OVERRIDE {
+    OneClickSigninBubbleView::set_close_on_deactivate_for_testing(false);
   }
 
  protected:
@@ -55,7 +43,8 @@ class OneClickSigninBubbleViewTest : public views::ViewsTestBase {
         string16(),
         string16(),
         delegate.Pass(),
-        anchor_widget_->GetContentsView(),
+        static_cast<BrowserView*>(
+            browser()->window())->toolbar()->location_bar(),
         base::Bind(&OneClickSigninBubbleViewTest::OnStartSync,
                    base::Unretained(this)));
 
@@ -104,26 +93,23 @@ class OneClickSigninBubbleViewTest : public views::ViewsTestBase {
     DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleTestDelegate);
   };
 
-  // Widget to host the anchor view of the bubble. Destroys itself when closed.
-  views::Widget* anchor_widget_;
-
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleViewTest);
 };
 
-TEST_F(OneClickSigninBubbleViewTest, ShowBubble) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, ShowBubble) {
   ShowOneClickSigninBubble(BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(OneClickSigninBubbleView::IsShowing());
 }
 
-TEST_F(OneClickSigninBubbleViewTest, ShowDialog) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, ShowDialog) {
   ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(OneClickSigninBubbleView::IsShowing());
 }
 
-TEST_F(OneClickSigninBubbleViewTest, HideBubble) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, HideBubble) {
   ShowOneClickSigninBubble(BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
 
   OneClickSigninBubbleView::Hide();
@@ -131,7 +117,7 @@ TEST_F(OneClickSigninBubbleViewTest, HideBubble) {
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
 }
 
-TEST_F(OneClickSigninBubbleViewTest, HideDialog) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, HideDialog) {
   ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
 
@@ -142,7 +128,7 @@ TEST_F(OneClickSigninBubbleViewTest, HideDialog) {
   EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
 }
 
-TEST_F(OneClickSigninBubbleViewTest, BubbleOkButton) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubbleOkButton) {
   OneClickSigninBubbleView* view =
     ShowOneClickSigninBubble(
       BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
@@ -161,7 +147,7 @@ TEST_F(OneClickSigninBubbleViewTest, BubbleOkButton) {
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
 }
 
-TEST_F(OneClickSigninBubbleViewTest, DialogOkButton) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogOkButton) {
   OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
       BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
 
@@ -181,7 +167,7 @@ TEST_F(OneClickSigninBubbleViewTest, DialogOkButton) {
   EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
 }
 
-TEST_F(OneClickSigninBubbleViewTest, DialogUndoButton) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogUndoButton) {
   OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
 
@@ -201,7 +187,7 @@ TEST_F(OneClickSigninBubbleViewTest, DialogUndoButton) {
   EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_);
 }
 
-TEST_F(OneClickSigninBubbleViewTest, BubbleAdvancedLink) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubbleAdvancedLink) {
   OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
 
@@ -216,7 +202,7 @@ TEST_F(OneClickSigninBubbleViewTest, BubbleAdvancedLink) {
   EXPECT_EQ(1, advanced_click_count_);
 }
 
-TEST_F(OneClickSigninBubbleViewTest, DialogAdvancedLink) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogAdvancedLink) {
   OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
 
@@ -233,7 +219,7 @@ TEST_F(OneClickSigninBubbleViewTest, DialogAdvancedLink) {
   EXPECT_EQ(0, advanced_click_count_);
 }
 
-TEST_F(OneClickSigninBubbleViewTest, BubbleLearnMoreLink) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubbleLearnMoreLink) {
   OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
 
@@ -248,7 +234,7 @@ TEST_F(OneClickSigninBubbleViewTest, BubbleLearnMoreLink) {
   EXPECT_EQ(0, dialog_learn_more_click_count_);
 }
 
-TEST_F(OneClickSigninBubbleViewTest, DialogLearnMoreLink) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogLearnMoreLink) {
   OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
       BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
 
@@ -263,7 +249,7 @@ TEST_F(OneClickSigninBubbleViewTest, DialogLearnMoreLink) {
   EXPECT_EQ(1, dialog_learn_more_click_count_);
 }
 
-TEST_F(OneClickSigninBubbleViewTest, BubblePressEnterKey) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubblePressEnterKey) {
   OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
 
@@ -278,7 +264,7 @@ TEST_F(OneClickSigninBubbleViewTest, BubblePressEnterKey) {
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
 }
 
-TEST_F(OneClickSigninBubbleViewTest, DialogPressEnterKey) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogPressEnterKey) {
   OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
 
@@ -295,7 +281,7 @@ TEST_F(OneClickSigninBubbleViewTest, DialogPressEnterKey) {
   EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
 }
 
-TEST_F(OneClickSigninBubbleViewTest, BubblePressEscapeKey) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubblePressEscapeKey) {
   OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
 
@@ -310,7 +296,7 @@ TEST_F(OneClickSigninBubbleViewTest, BubblePressEscapeKey) {
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
 }
 
-TEST_F(OneClickSigninBubbleViewTest, DialogPressEscapeKey) {
+IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogPressEscapeKey) {
   OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble(
     BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);