Fix flaky test OneClickSigninBubbleViewBrowserTest::ShowBubble

chrome/browser/ui/views/sync/one_click_signin_bubble_view.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_SYNC_ONE_CLICK_SIGNIN_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_SYNC_ONE_CLICK_SIGNIN_BUBBLE_VIEW_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/views/toolbar_view.h"
+#include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
 
 namespace base {
 class MessageLoop;
 }
 
 namespace views {
 class GridLayout;
+class ImageButton;
 class LabelButton;
+class View;
 }
 
 // OneClickSigninBubbleView is a view intended to be used as the content of an
 // Bubble. It provides simple and concise feedback to the user that sync'ing
 // has started after using the one-click singin infobar.
 class OneClickSigninBubbleView : public views::BubbleDelegateView,
                                  public views::LinkListener,
                                  public views::ButtonListener {
  public:
   // Show the one-click signin bubble if not already showing.  The bubble
   // will be placed visually beneath |anchor_view|.  |start_sync| is called
   // to start sync.
   static void ShowBubble(BrowserWindow::OneClickSigninBubbleType type,
                          const string16& email,
                          const string16& error_message,
-                         ToolbarView* toolbar_view,
+                         scoped_ptr<OneClickSigninBubbleDelegate> delegate,
+                         views::View* anchor_view,
                          const BrowserWindow::StartSyncCallback& start_sync);
 
   static bool IsShowing();
 
   static void Hide();
 
   // Gets the global bubble view.  If its not showing returns NULL.  This
   // method is meant to be called only from tests.
   static OneClickSigninBubbleView* view_for_testing() { return bubble_view_; }
 
  protected:
   // Creates a OneClickSigninBubbleView.
   OneClickSigninBubbleView(
-      content::WebContents* web_contents,
-      views::View* anchor_view,
       const string16& error_message,
       const string16& email,
+      scoped_ptr<OneClickSigninBubbleDelegate> delegate,
+      views::View* anchor_view,
       const BrowserWindow::StartSyncCallback& start_sync_callback,
       bool is_sync_dialog);
 
   virtual ~OneClickSigninBubbleView();
 
  private:
-  friend class OneClickSigninBubbleViewBrowserTest;
+  friend class OneClickSigninBubbleViewTest;
 
-  FRIEND_TEST_ALL_PREFIXES(
-    OneClickSigninBubbleViewBrowserTest, BubbleOkButton);
-  FRIEND_TEST_ALL_PREFIXES(
-    OneClickSigninBubbleViewBrowserTest, DialogOkButton);
-  FRIEND_TEST_ALL_PREFIXES(
-    OneClickSigninBubbleViewBrowserTest, DialogUndoButton);
-  FRIEND_TEST_ALL_PREFIXES(
-    OneClickSigninBubbleViewBrowserTest, BubbleAdvancedLink);
-  FRIEND_TEST_ALL_PREFIXES(
-    OneClickSigninBubbleViewBrowserTest, DialogAdvancedLink);
-  FRIEND_TEST_ALL_PREFIXES(
-    OneClickSigninBubbleViewBrowserTest, BubbleLearnMoreLink);
-  FRIEND_TEST_ALL_PREFIXES(
-    OneClickSigninBubbleViewBrowserTest, DialogLearnMoreLink);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewTest, BubbleOkButton);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewTest, DialogOkButton);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewTest, DialogUndoButton);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewTest, BubbleAdvancedLink);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewTest, DialogAdvancedLink);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewTest, BubbleLearnMoreLink);
+  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewTest, DialogLearnMoreLink);
 
   // Overridden from views::BubbleDelegateView:
   virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
   virtual void Init() OVERRIDE;
 
   // Overridden from views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
@@ skipping 16 matching lines @@
   void InitButtons(views::GridLayout* layout);
   void GetButtons(views::LabelButton** ok_button,
                           views::LabelButton** undo_button);
 
   // Creates learn more link to be used at the bottom of the bubble.
   void InitLearnMoreLink();
 
   // Creates advanced link to be used at the bottom of the bubble.
   void InitAdvancedLink();
 
-  // The bubble/dialog will always outlive the web_content, so this is ok.
-  content::WebContents* web_contents_;
+  // Delegate to handle clicking on links in the bubble.
+  scoped_ptr<OneClickSigninBubbleDelegate> delegate_;
 
   // Alternate error message to be displayed.
   const string16 error_message_;
 
   // The user's email address to be used for sync.
   const string16 email_;
 
   // This callback is nulled once its called, so that it is called only once.
   // It will be called when the bubble is closed if it has not been called
   // and nulled earlier.
@@ skipping 19 matching lines @@
   // A message loop used only with unit tests.
   base::MessageLoop* message_loop_for_testing_;
 
   // The bubble, if we're showing one.
   static OneClickSigninBubbleView* bubble_view_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_SYNC_ONE_CLICK_SIGNIN_BUBBLE_VIEW_H_