| 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 <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 fetcher->delegate()->OnURLFetchComplete(fetcher); | 75 fetcher->delegate()->OnURLFetchComplete(fetcher); |
| 76 } | 76 } |
| 77 | 77 |
| 78 protected: | 78 protected: |
| 79 // InProcessBrowserTest members. | 79 // InProcessBrowserTest members. |
| 80 void SetUp() override { | 80 void SetUp() override { |
| 81 InProcessBrowserTest::SetUp(); | 81 InProcessBrowserTest::SetUp(); |
| 82 } | 82 } |
| 83 void SetUpOnMainThread() override { | 83 void SetUpOnMainThread() override { |
| 84 ResetObserver(); | 84 ResetObserver(); |
| 85 InProcessBrowserTest::SetUpOnMainThread(); | |
| 86 } | 85 } |
| 87 | 86 |
| 88 private: | 87 private: |
| 89 net::TestURLFetcherFactory url_fetcher_factory_; | 88 net::TestURLFetcherFactory url_fetcher_factory_; |
| 90 | 89 |
| 91 using LangageDetectionObserver = | 90 using LangageDetectionObserver = |
| 92 ui_test_utils::WindowedNotificationObserverWithDetails< | 91 ui_test_utils::WindowedNotificationObserverWithDetails< |
| 93 translate::LanguageDetectionDetails>; | 92 translate::LanguageDetectionDetails>; |
| 94 | 93 |
| 95 std::unique_ptr<LangageDetectionObserver> language_detected_signal_; | 94 std::unique_ptr<LangageDetectionObserver> language_detected_signal_; |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 ChromeTranslateClient::FromWebContents(restored_web_contents); | 274 ChromeTranslateClient::FromWebContents(restored_web_contents); |
| 276 if (restored_translate_client->GetLanguageState() | 275 if (restored_translate_client->GetLanguageState() |
| 277 .current_language() | 276 .current_language() |
| 278 .empty()) { | 277 .empty()) { |
| 279 ResetObserver(); | 278 ResetObserver(); |
| 280 WaitUntilLanguageDetected(); | 279 WaitUntilLanguageDetected(); |
| 281 } | 280 } |
| 282 EXPECT_EQ("fr", | 281 EXPECT_EQ("fr", |
| 283 restored_translate_client->GetLanguageState().current_language()); | 282 restored_translate_client->GetLanguageState().current_language()); |
| 284 } | 283 } |
| OLD | NEW |