| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" | 5 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/translate/cld_data_harness.h" | 10 #include "chrome/browser/translate/cld_data_harness.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 // very late in the test fixture setup process. | 28 // very late in the test fixture setup process. |
| 29 cld_data_harness->Init(); | 29 cld_data_harness->Init(); |
| 30 InProcessBrowserTest::SetUpOnMainThread(); | 30 InProcessBrowserTest::SetUpOnMainThread(); |
| 31 } | 31 } |
| 32 | 32 |
| 33 private: | 33 private: |
| 34 scoped_ptr<test::CldDataHarness> cld_data_harness; | 34 scoped_ptr<test::CldDataHarness> cld_data_harness; |
| 35 DISALLOW_COPY_AND_ASSIGN(TranslateBubbleViewBrowserTest); | 35 DISALLOW_COPY_AND_ASSIGN(TranslateBubbleViewBrowserTest); |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 // Flaky: crbug.com/394066 |
| 38 IN_PROC_BROWSER_TEST_F(TranslateBubbleViewBrowserTest, | 39 IN_PROC_BROWSER_TEST_F(TranslateBubbleViewBrowserTest, |
| 39 CloseBrowserWithoutTranslating) { | 40 DISABLED_CloseBrowserWithoutTranslating) { |
| 40 EXPECT_FALSE(TranslateBubbleView::IsShowing()); | 41 EXPECT_FALSE(TranslateBubbleView::IsShowing()); |
| 41 | 42 |
| 42 // Show a French page and wait until the bubble is shown. | 43 // Show a French page and wait until the bubble is shown. |
| 43 content::WebContents* current_web_contents = | 44 content::WebContents* current_web_contents = |
| 44 browser()->tab_strip_model()->GetActiveWebContents(); | 45 browser()->tab_strip_model()->GetActiveWebContents(); |
| 45 content::Source<content::WebContents> source(current_web_contents); | 46 content::Source<content::WebContents> source(current_web_contents); |
| 46 ui_test_utils::WindowedNotificationObserverWithDetails< | 47 ui_test_utils::WindowedNotificationObserverWithDetails< |
| 47 LanguageDetectionDetails> | 48 LanguageDetectionDetails> |
| 48 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, | 49 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, |
| 49 source); | 50 source); |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 chrome::CloseWebContents(browser(), web_contents, false); | 114 chrome::CloseWebContents(browser(), web_contents, false); |
| 114 EXPECT_EQ(active_index, browser()->tab_strip_model()->active_index()); | 115 EXPECT_EQ(active_index, browser()->tab_strip_model()->active_index()); |
| 115 EXPECT_EQ(1, browser()->tab_strip_model()->count()); | 116 EXPECT_EQ(1, browser()->tab_strip_model()->count()); |
| 116 EXPECT_FALSE(TranslateBubbleView::IsShowing()); | 117 EXPECT_FALSE(TranslateBubbleView::IsShowing()); |
| 117 | 118 |
| 118 // Close the last tab. | 119 // Close the last tab. |
| 119 chrome::CloseWebContents(browser(), | 120 chrome::CloseWebContents(browser(), |
| 120 browser()->tab_strip_model()->GetActiveWebContents(), | 121 browser()->tab_strip_model()->GetActiveWebContents(), |
| 121 false); | 122 false); |
| 122 } | 123 } |
| OLD | NEW |