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

Side by Side Diff: chrome/browser/chromeos/login/oobe_localization_browsertest.cc

Issue 189233003: Fix clang compilation for oobe_localization_browsertest.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/task_runner.h" 8 #include "base/task_runner.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 std::string initial_locale_; 82 std::string initial_locale_;
83 std::string keyboard_layout_; 83 std::string keyboard_layout_;
84 }; 84 };
85 85
86 } // namespace system 86 } // namespace system
87 87
88 class OobeLocalizationTest : public InProcessBrowserTest { 88 class OobeLocalizationTest : public InProcessBrowserTest {
89 public: 89 public:
90 OobeLocalizationTest(); 90 OobeLocalizationTest();
91 ~OobeLocalizationTest(); 91 virtual ~OobeLocalizationTest();
92 92
93 // Verifies that the comma-separated |values| corresponds with the first 93 // Verifies that the comma-separated |values| corresponds with the first
94 // values in |select_id|, optionally checking for an options group label after 94 // values in |select_id|, optionally checking for an options group label after
95 // the first set of options. 95 // the first set of options.
96 void VerifyInitialOptions(const char* select_id, 96 void VerifyInitialOptions(const char* select_id,
97 const char* values, 97 const char* values,
98 bool check_separator); 98 bool check_separator);
99 99
100 // Verifies that |value| exists in |select_id|. 100 // Verifies that |value| exists in |select_id|.
101 void VerifyOptionExists(const char* select_id, const char* value); 101 void VerifyOptionExists(const char* select_id, const char* value);
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 RunLocalizationTest("es,en-US,nl", "xkb:be::nld", 300 RunLocalizationTest("es,en-US,nl", "xkb:be::nld",
301 "es,en-US,nl", "xkb:be::nld", 301 "es,en-US,nl", "xkb:be::nld",
302 "xkb:be::nld,[xkb:es::spa,xkb:latam::spa,xkb:us::eng]"); 302 "xkb:be::nld,[xkb:es::spa,xkb:latam::spa,xkb:us::eng]");
303 303
304 RunLocalizationTest("ru,de", "xkb:ru::rus", 304 RunLocalizationTest("ru,de", "xkb:ru::rus",
305 "ru,de", kUSLayout, 305 "ru,de", kUSLayout,
306 "xkb:us::eng"); 306 "xkb:us::eng");
307 } 307 }
308 308
309 } // namespace chromeos 309 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698