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

Side by Side Diff: chrome/browser/ui/webui/bidi_checker_web_ui_test.cc

Issue 9701086: Adjust signatures to pass string rather than char* since it ultimately constructs a GURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 | « chrome/browser/ui/webui/bidi_checker_web_ui_test.h ('k') | 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 (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 "chrome/browser/ui/webui/bidi_checker_web_ui_test.h" 5 #include "chrome/browser/ui/webui/bidi_checker_web_ui_test.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 WebUIBidiCheckerBrowserTest::~WebUIBidiCheckerBrowserTest() {} 44 WebUIBidiCheckerBrowserTest::~WebUIBidiCheckerBrowserTest() {}
45 45
46 WebUIBidiCheckerBrowserTest::WebUIBidiCheckerBrowserTest() {} 46 WebUIBidiCheckerBrowserTest::WebUIBidiCheckerBrowserTest() {}
47 47
48 void WebUIBidiCheckerBrowserTest::SetUpInProcessBrowserTestFixture() { 48 void WebUIBidiCheckerBrowserTest::SetUpInProcessBrowserTestFixture() {
49 WebUIBrowserTest::SetUpInProcessBrowserTestFixture(); 49 WebUIBrowserTest::SetUpInProcessBrowserTestFixture();
50 WebUIBrowserTest::AddLibrary(WebUIBidiCheckerLibraryJSPath()); 50 WebUIBrowserTest::AddLibrary(WebUIBidiCheckerLibraryJSPath());
51 WebUIBrowserTest::AddLibrary(FilePath(kBidiCheckerTestsJS)); 51 WebUIBrowserTest::AddLibrary(FilePath(kBidiCheckerTestsJS));
52 } 52 }
53 53
54 void WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(const char pageURL[], 54 void WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
55 bool isRTL) { 55 const std::string& page_url, bool is_rtl) {
56 ui_test_utils::NavigateToURL(browser(), GURL(pageURL)); 56 ui_test_utils::NavigateToURL(browser(), GURL(page_url));
57 ASSERT_TRUE(RunJavascriptTest("runBidiChecker", 57 ASSERT_TRUE(RunJavascriptTest("runBidiChecker",
58 Value::CreateStringValue(pageURL), 58 Value::CreateStringValue(page_url),
59 Value::CreateBooleanValue(isRTL))); 59 Value::CreateBooleanValue(is_rtl)));
60 } 60 }
61 61
62 void WebUIBidiCheckerBrowserTestLTR::RunBidiCheckerOnPage( 62 void WebUIBidiCheckerBrowserTestLTR::RunBidiCheckerOnPage(
63 const char pageURL[]) { 63 const std::string& page_url) {
64 WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, false); 64 WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, false);
65 } 65 }
66 66
67 void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage( 67 void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage(
68 const char pageURL[]) { 68 const std::string& page_url) {
69 WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, true); 69 WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, true);
70 } 70 }
71 71
72 void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() { 72 void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
73 WebUIBidiCheckerBrowserTest::SetUpOnMainThread(); 73 WebUIBidiCheckerBrowserTest::SetUpOnMainThread();
74 FilePath pak_path; 74 FilePath pak_path;
75 app_locale_ = base::i18n::GetConfiguredLocale(); 75 app_locale_ = base::i18n::GetConfiguredLocale();
76 ASSERT_TRUE(PathService::Get(base::FILE_MODULE, &pak_path)); 76 ASSERT_TRUE(PathService::Get(base::FILE_MODULE, &pak_path));
77 pak_path = pak_path.DirName(); 77 pak_path = pak_path.DirName();
78 pak_path = pak_path.AppendASCII("pseudo_locales"); 78 pak_path = pak_path.AppendASCII("pseudo_locales");
79 pak_path = pak_path.AppendASCII("fake-bidi"); 79 pak_path = pak_path.AppendASCII("fake-bidi");
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 "\x99\xD7\x9F\x20\x32\x33", 290 "\x99\xD7\x9F\x20\x32\x33",
291 "\xD7\xA7\xD7\x95\xD7\x9E\xD7\x94\x20\x32\x36", 291 "\xD7\xA7\xD7\x95\xD7\x9E\xD7\x94\x20\x32\x36",
292 "\xD7\xAA\xD7\x9C\x20\xD7\x90\xD7\x91\xD7\x99" 292 "\xD7\xAA\xD7\x9C\x20\xD7\x90\xD7\x91\xD7\x99"
293 "\xD7\x91", 293 "\xD7\x91",
294 "", 294 "",
295 "66183", 295 "66183",
296 "\xD7\x99\xD7\xA9\xD7\xA8\xD7\x90\xD7\x9C", 296 "\xD7\x99\xD7\xA9\xD7\xA8\xD7\x90\xD7\x9C",
297 "0000"); 297 "0000");
298 std::string url(chrome::kChromeUISettingsFrameURL); 298 std::string url(chrome::kChromeUISettingsFrameURL);
299 url += std::string(chrome::kAutofillSubPage); 299 url += std::string(chrome::kAutofillSubPage);
300 RunBidiCheckerOnPage(url.c_str()); 300 RunBidiCheckerOnPage(url);
301 } 301 }
302 302
303 // http://crbug.com/94642 303 // http://crbug.com/94642
304 // http://crbug.com/95425 304 // http://crbug.com/95425
305 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, 305 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
306 DISABLED_TestSettingsAutofillPage) { 306 DISABLED_TestSettingsAutofillPage) {
307 SetupSettingsAutofillPageTest(browser()->profile(), 307 SetupSettingsAutofillPageTest(browser()->profile(),
308 "Milton", 308 "Milton",
309 "C.", 309 "C.",
310 "Waddams", 310 "Waddams",
311 "red.swingline@initech.com", 311 "red.swingline@initech.com",
312 "Initech", 312 "Initech",
313 "4120 Freidrich Lane", 313 "4120 Freidrich Lane",
314 "Basement", 314 "Basement",
315 "Austin", 315 "Austin",
316 "Texas", 316 "Texas",
317 "78744", 317 "78744",
318 "United States", 318 "United States",
319 "5125551234"); 319 "5125551234");
320 std::string url(chrome::kChromeUISettingsFrameURL); 320 std::string url(chrome::kChromeUISettingsFrameURL);
321 url += std::string(chrome::kAutofillSubPage); 321 url += std::string(chrome::kAutofillSubPage);
322 RunBidiCheckerOnPage(url.c_str()); 322 RunBidiCheckerOnPage(url);
323 } 323 }
324 324
325 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, 325 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
326 TestSettingsClearBrowserDataPage) { 326 TestSettingsClearBrowserDataPage) {
327 std::string url(chrome::kChromeUISettingsFrameURL); 327 std::string url(chrome::kChromeUISettingsFrameURL);
328 url += std::string(chrome::kClearBrowserDataSubPage); 328 url += std::string(chrome::kClearBrowserDataSubPage);
329 RunBidiCheckerOnPage(url.c_str()); 329 RunBidiCheckerOnPage(url);
330 } 330 }
331 331
332 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, 332 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
333 MAYBE_TestSettingsClearBrowserDataPage) { 333 MAYBE_TestSettingsClearBrowserDataPage) {
334 std::string url(chrome::kChromeUISettingsFrameURL); 334 std::string url(chrome::kChromeUISettingsFrameURL);
335 url += std::string(chrome::kClearBrowserDataSubPage); 335 url += std::string(chrome::kClearBrowserDataSubPage);
336 RunBidiCheckerOnPage(url.c_str()); 336 RunBidiCheckerOnPage(url);
337 } 337 }
338 338
339 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, 339 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
340 TestSettingsContentSettingsPage) { 340 TestSettingsContentSettingsPage) {
341 std::string url(chrome::kChromeUISettingsFrameURL); 341 std::string url(chrome::kChromeUISettingsFrameURL);
342 url += std::string(chrome::kContentSettingsSubPage); 342 url += std::string(chrome::kContentSettingsSubPage);
343 RunBidiCheckerOnPage(url.c_str()); 343 RunBidiCheckerOnPage(url);
344 } 344 }
345 345
346 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, 346 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
347 MAYBE_TestSettingsContentSettingsPage) { 347 MAYBE_TestSettingsContentSettingsPage) {
348 std::string url(chrome::kChromeUISettingsFrameURL); 348 std::string url(chrome::kChromeUISettingsFrameURL);
349 url += std::string(chrome::kContentSettingsSubPage); 349 url += std::string(chrome::kContentSettingsSubPage);
350 RunBidiCheckerOnPage(url.c_str()); 350 RunBidiCheckerOnPage(url);
351 } 351 }
352 352
353 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, 353 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
354 TestSettingsContentSettingsExceptionsPage) { 354 TestSettingsContentSettingsExceptionsPage) {
355 std::string url(chrome::kChromeUISettingsFrameURL); 355 std::string url(chrome::kChromeUISettingsFrameURL);
356 url += std::string(chrome::kContentSettingsExceptionsSubPage); 356 url += std::string(chrome::kContentSettingsExceptionsSubPage);
357 RunBidiCheckerOnPage(url.c_str()); 357 RunBidiCheckerOnPage(url);
358 } 358 }
359 359
360 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, 360 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
361 MAYBE_TestSettingsContentSettingsExceptionsPage) { 361 MAYBE_TestSettingsContentSettingsExceptionsPage) {
362 std::string url(chrome::kChromeUISettingsFrameURL); 362 std::string url(chrome::kChromeUISettingsFrameURL);
363 url += std::string(chrome::kContentSettingsExceptionsSubPage); 363 url += std::string(chrome::kContentSettingsExceptionsSubPage);
364 RunBidiCheckerOnPage(url.c_str()); 364 RunBidiCheckerOnPage(url);
365 } 365 }
366 366
367 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, 367 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
368 TestSettingsLanguageOptionsPage) { 368 TestSettingsLanguageOptionsPage) {
369 std::string url(chrome::kChromeUISettingsFrameURL); 369 std::string url(chrome::kChromeUISettingsFrameURL);
370 url += std::string(chrome::kLanguageOptionsSubPage); 370 url += std::string(chrome::kLanguageOptionsSubPage);
371 RunBidiCheckerOnPage(url.c_str()); 371 RunBidiCheckerOnPage(url);
372 } 372 }
373 373
374 // http://crbug.com/117871 374 // http://crbug.com/117871
375 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, 375 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
376 DISABLED_TestSettingsLanguageOptionsPage) { 376 DISABLED_TestSettingsLanguageOptionsPage) {
377 std::string url(chrome::kChromeUISettingsFrameURL); 377 std::string url(chrome::kChromeUISettingsFrameURL);
378 url += std::string(chrome::kLanguageOptionsSubPage); 378 url += std::string(chrome::kLanguageOptionsSubPage);
379 RunBidiCheckerOnPage(url.c_str()); 379 RunBidiCheckerOnPage(url);
380 } 380 }
381 381
382 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, 382 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
383 TestSettingsSearchEnginesOptionsPage) { 383 TestSettingsSearchEnginesOptionsPage) {
384 std::string url(chrome::kChromeUISettingsFrameURL); 384 std::string url(chrome::kChromeUISettingsFrameURL);
385 url += std::string(chrome::kSearchEnginesSubPage); 385 url += std::string(chrome::kSearchEnginesSubPage);
386 RunBidiCheckerOnPage(url.c_str()); 386 RunBidiCheckerOnPage(url);
387 } 387 }
388 388
389 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, 389 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
390 MAYBE_TestSettingsSearchEnginesOptionsPage) { 390 MAYBE_TestSettingsSearchEnginesOptionsPage) {
391 std::string url(chrome::kChromeUISettingsFrameURL); 391 std::string url(chrome::kChromeUISettingsFrameURL);
392 url += std::string(chrome::kSearchEnginesSubPage); 392 url += std::string(chrome::kSearchEnginesSubPage);
393 RunBidiCheckerOnPage(url.c_str()); 393 RunBidiCheckerOnPage(url);
394 } 394 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/bidi_checker_web_ui_test.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698