OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "components/translate/core/browser/translate_manager.h" | 5 #include "components/translate/core/browser/translate_manager.h" |
6 | 6 |
7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
8 #include "chrome/browser/prefs/session_startup_pref.h" | 8 #include "chrome/browser/prefs/session_startup_pref.h" |
9 #include "chrome/browser/translate/translate_browser_test_utils.h" | |
9 #include "chrome/browser/translate/translate_tab_helper.h" | 10 #include "chrome/browser/translate/translate_tab_helper.h" |
10 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
12 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
13 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
14 #include "components/translate/core/common/language_detection_details.h" | 15 #include "components/translate/core/common/language_detection_details.h" |
15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
16 | 17 |
17 class TranslateManagerBrowserTest : public InProcessBrowserTest {}; | 18 class TranslateManagerBrowserTest : public InProcessBrowserTest {}; |
18 | 19 |
19 // Test is flaky on Win http://crbug.com/166334 | 20 // Test is flaky on Win http://crbug.com/166334 |
20 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
21 #define MAYBE_PRE_TranslateSessionRestore DISABLED_PRE_TranslateSessionRestore | 22 #define MAYBE_PRE_TranslateSessionRestore DISABLED_PRE_TranslateSessionRestore |
22 #else | 23 #else |
23 #define MAYBE_PRE_TranslateSessionRestore PRE_TranslateSessionRestore | 24 #define MAYBE_PRE_TranslateSessionRestore PRE_TranslateSessionRestore |
24 #endif | 25 #endif |
25 // Test that session restore restores the translate infobar and other translate | 26 // Test that session restore restores the translate infobar and other translate |
26 // settings. | 27 // settings. |
27 IN_PROC_BROWSER_TEST_F(TranslateManagerBrowserTest, | 28 IN_PROC_BROWSER_TEST_F(TranslateManagerBrowserTest, |
28 MAYBE_PRE_TranslateSessionRestore) { | 29 MAYBE_PRE_TranslateSessionRestore) { |
30 test::ScopedCLDDynamicDataHarness dynamic_data_scope; | |
Takashi Toyoshima
2014/05/19 14:32:47
Or you may want to have it as a member of Translat
| |
29 SessionStartupPref pref(SessionStartupPref::LAST); | 31 SessionStartupPref pref(SessionStartupPref::LAST); |
30 SessionStartupPref::SetStartupPref(browser()->profile(), pref); | 32 SessionStartupPref::SetStartupPref(browser()->profile(), pref); |
31 | 33 |
32 content::WebContents* current_web_contents = | 34 content::WebContents* current_web_contents = |
33 browser()->tab_strip_model()->GetActiveWebContents(); | 35 browser()->tab_strip_model()->GetActiveWebContents(); |
34 TranslateTabHelper* translate_tab_helper = | 36 TranslateTabHelper* translate_tab_helper = |
35 TranslateTabHelper::FromWebContents(current_web_contents); | 37 TranslateTabHelper::FromWebContents(current_web_contents); |
36 content::Source<content::WebContents> source(current_web_contents); | 38 content::Source<content::WebContents> source(current_web_contents); |
37 | 39 |
38 ui_test_utils::WindowedNotificationObserverWithDetails< | 40 ui_test_utils::WindowedNotificationObserverWithDetails< |
(...skipping 12 matching lines...) Expand all Loading... | |
51 EXPECT_EQ("fr", translate_tab_helper->GetLanguageState().original_language()); | 53 EXPECT_EQ("fr", translate_tab_helper->GetLanguageState().original_language()); |
52 } | 54 } |
53 | 55 |
54 #if defined (OS_WIN) | 56 #if defined (OS_WIN) |
55 #define MAYBE_TranslateSessionRestore DISABLED_TranslateSessionRestore | 57 #define MAYBE_TranslateSessionRestore DISABLED_TranslateSessionRestore |
56 #else | 58 #else |
57 #define MAYBE_TranslateSessionRestore TranslateSessionRestore | 59 #define MAYBE_TranslateSessionRestore TranslateSessionRestore |
58 #endif | 60 #endif |
59 IN_PROC_BROWSER_TEST_F(TranslateManagerBrowserTest, | 61 IN_PROC_BROWSER_TEST_F(TranslateManagerBrowserTest, |
60 MAYBE_TranslateSessionRestore) { | 62 MAYBE_TranslateSessionRestore) { |
63 test::ScopedCLDDynamicDataHarness dynamic_data_scope; | |
61 content::WebContents* current_web_contents = | 64 content::WebContents* current_web_contents = |
62 browser()->tab_strip_model()->GetActiveWebContents(); | 65 browser()->tab_strip_model()->GetActiveWebContents(); |
63 content::Source<content::WebContents> source(current_web_contents); | 66 content::Source<content::WebContents> source(current_web_contents); |
64 | 67 |
65 ui_test_utils::WindowedNotificationObserverWithDetails< | 68 ui_test_utils::WindowedNotificationObserverWithDetails< |
66 LanguageDetectionDetails> | 69 LanguageDetectionDetails> |
67 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, | 70 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, |
68 source); | 71 source); |
69 fr_language_detected_signal.Wait(); | 72 fr_language_detected_signal.Wait(); |
70 } | 73 } |
OLD | NEW |