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

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

Issue 10540134: Rollback about:blank loading, leaving DCHECK/DLOG. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 (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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 const std::string& page_url) { 63 const std::string& page_url) {
64 WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, false); 64 WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, false);
65 } 65 }
66 66
67 void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage( 67 void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage(
68 const std::string& page_url) { 68 const std::string& page_url) {
69 WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, true); 69 WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, true);
70 } 70 }
71 71
72 void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() { 72 void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
73 // Ensure that no other page (NTP4, home page, e.g.) is loading when we reload
74 // the locale resources.
75 ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
76
77 WebUIBidiCheckerBrowserTest::SetUpOnMainThread(); 73 WebUIBidiCheckerBrowserTest::SetUpOnMainThread();
78 FilePath pak_path; 74 FilePath pak_path;
79 app_locale_ = base::i18n::GetConfiguredLocale(); 75 app_locale_ = base::i18n::GetConfiguredLocale();
80 ASSERT_TRUE(PathService::Get(base::FILE_MODULE, &pak_path)); 76 ASSERT_TRUE(PathService::Get(base::FILE_MODULE, &pak_path));
81 pak_path = pak_path.DirName(); 77 pak_path = pak_path.DirName();
82 pak_path = pak_path.AppendASCII("pseudo_locales"); 78 pak_path = pak_path.AppendASCII("pseudo_locales");
83 pak_path = pak_path.AppendASCII("fake-bidi"); 79 pak_path = pak_path.AppendASCII("fake-bidi");
84 pak_path = pak_path.ReplaceExtension(FILE_PATH_LITERAL("pak")); 80 pak_path = pak_path.ReplaceExtension(FILE_PATH_LITERAL("pak"));
85 ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(pak_path); 81 ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(pak_path);
86 ASSERT_FALSE( 82 ASSERT_FALSE(
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 // chrome://history-frame 836 // chrome://history-frame
841 //============================== 837 //==============================
842 838
843 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestHistoryFrame) { 839 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestHistoryFrame) {
844 RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL); 840 RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
845 } 841 }
846 842
847 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestHistoryFrame) { 843 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestHistoryFrame) {
848 RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL); 844 RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
849 } 845 }
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