Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Side by Side Diff: chrome/browser/translate/translate_manager_browsertest.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "build/build_config.h"
8 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/prefs/session_startup_pref.h" 10 #include "chrome/browser/prefs/session_startup_pref.h"
10 #include "chrome/browser/translate/chrome_translate_client.h" 11 #include "chrome/browser/translate/chrome_translate_client.h"
11 #include "chrome/browser/translate/cld_data_harness.h" 12 #include "chrome/browser/translate/cld_data_harness.h"
12 #include "chrome/browser/translate/cld_data_harness_factory.h" 13 #include "chrome/browser/translate/cld_data_harness_factory.h"
13 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
16 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
17 #include "components/translate/core/common/language_detection_details.h" 18 #include "components/translate/core/common/language_detection_details.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 active_adopted_language = GetLanguageFor(active_web_contents); 163 active_adopted_language = GetLanguageFor(active_web_contents);
163 } else if (restored_adopted_language.empty()) { 164 } else if (restored_adopted_language.empty()) {
164 ResetObserver(); 165 ResetObserver();
165 WaitUntilLanguageDetected(); 166 WaitUntilLanguageDetected();
166 restored_adopted_language = GetLanguageFor(restored_web_contents); 167 restored_adopted_language = GetLanguageFor(restored_web_contents);
167 } 168 }
168 169
169 EXPECT_EQ("fr", restored_adopted_language); 170 EXPECT_EQ("fr", restored_adopted_language);
170 EXPECT_EQ("und", active_adopted_language); 171 EXPECT_EQ("und", active_adopted_language);
171 } 172 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698