Fix flaky test OneClickSigninBubbleViewBrowserTest::ShowBubble

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 2abb730300612f3ab70f688a190481c19d5b922c..89be49ca98985109dae3b0ca6d6d20f45b8f53a7 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -274,6 +274,7 @@
         'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
         'browser/ui/views/panels/panel_view_browsertest.cc',
         'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
+        'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc',
         'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
         'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
         'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
@@ -291,6 +292,11 @@
         'test/ppapi/ppapi_interactive_browsertest.cc',
       ],
       'conditions': [
+        ['enable_one_click_signin==0', {
+          'sources!': [
+            'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc'

[fdoray, 2013/07/11 14:10:50]

For simplicity, I put the whole file in interactive_ui_tests. If it's really bad
to have a lot of interactive_ui_tests, I can move the dialog tests in a
different file that would stay in browser_tests.

+          ]
+        }],
         ['use_x11==1', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
@@ -1593,7 +1599,6 @@
         'browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc',
         'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
         'browser/ui/views/select_file_dialog_extension_browsertest.cc',
-        'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc',
         'browser/ui/views/toolbar_view_browsertest.cc',
         'browser/ui/views/web_dialog_view_browsertest.cc',
         'browser/ui/webui/bidi_checker_web_ui_test.cc',
@@ -1745,8 +1750,7 @@
       'conditions': [
         ['enable_one_click_signin==0', {
           'sources!': [
-            'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc',
-            'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc',
+            'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc'

[fdoray, 2013/07/11 14:10:50]

A GTK bubble also disappears when it looses focus. However, I tried to manually
and programmatically change the focus in the middle of these test cases and the
bubble dismissal always happen after the end of the test body.

           ]
         }],
         ['disable_nacl==0', {