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

Unified Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 620563002: ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 826704b511ebc80910d3df57dcee490e1637929a..a11ea2d128a1527d2d7039f4beb2ac3def5279fb 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -120,21 +120,15 @@ class PrefStoreStub : public TestingPrefStore {
};
struct SwitchLanguageTestData {
- SwitchLanguageTestData() : success(false), done(false) {}
+ SwitchLanguageTestData() : done(false) {}
- std::string requested_locale;
- std::string loaded_locale;
- bool success;
+ scoped_ptr<locale_util::LanguageSwitchResult> result;
bool done;
};
void OnLocaleSwitched(SwitchLanguageTestData* self,
- const std::string& locale,
- const std::string& loaded_locale,
- const bool success) {
- self->requested_locale = locale;
- self->loaded_locale = loaded_locale;
- self->success = success;
+ scoped_ptr<locale_util::LanguageSwitchResult> result) {
+ self->result.reset(result.release());
self->done = true;
}
@@ -151,9 +145,10 @@ void RunSwitchLanguageTest(const std::string& locale,
content::RunAllBlockingPoolTasksUntilIdle();
EXPECT_EQ(data.done, true);
- EXPECT_EQ(data.requested_locale, locale);
- EXPECT_EQ(data.loaded_locale, expected_locale);
- EXPECT_EQ(data.success, expect_success);
+ ASSERT_TRUE(data.result.get());
+ EXPECT_EQ(data.result->requested_locale, locale);
+ EXPECT_EQ(data.result->loaded_locale, expected_locale);
+ EXPECT_EQ(data.result->success, expect_success);
}
void SetUpCrasAndEnableChromeVox(int volume_percent, bool mute_on) {

Powered by Google App Engine
This is Rietveld 408576698