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

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

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 years, 5 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
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/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 ASSERT_TRUE(PathService::Get(base::FILE_MODULE, &pak_path)); 123 ASSERT_TRUE(PathService::Get(base::FILE_MODULE, &pak_path));
124 pak_path = pak_path.DirName(); 124 pak_path = pak_path.DirName();
125 pak_path = pak_path.AppendASCII("pseudo_locales"); 125 pak_path = pak_path.AppendASCII("pseudo_locales");
126 pak_path = pak_path.AppendASCII("fake-bidi"); 126 pak_path = pak_path.AppendASCII("fake-bidi");
127 pak_path = pak_path.ReplaceExtension(FILE_PATH_LITERAL("pak")); 127 pak_path = pak_path.ReplaceExtension(FILE_PATH_LITERAL("pak"));
128 ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(pak_path); 128 ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(pak_path);
129 ReloadLocaleResources("he"); 129 ReloadLocaleResources("he");
130 base::i18n::SetICUDefaultLocale("he"); 130 base::i18n::SetICUDefaultLocale("he");
131 } 131 }
132 132
133 void WebUIBidiCheckerBrowserTestRTL::CleanUpOnMainThread() { 133 void WebUIBidiCheckerBrowserTestRTL::TearDownOnMainThread() {
134 WebUIBidiCheckerBrowserTest::CleanUpOnMainThread(); 134 WebUIBidiCheckerBrowserTest::TearDownOnMainThread();
135 135
136 base::i18n::SetICUDefaultLocale(app_locale_); 136 base::i18n::SetICUDefaultLocale(app_locale_);
137 ResourceBundle::GetSharedInstance().OverrideLocalePakForTest( 137 ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(
138 base::FilePath()); 138 base::FilePath());
139 ReloadLocaleResources(app_locale_); 139 ReloadLocaleResources(app_locale_);
140 } 140 }
141 141
142 // Tests 142 // Tests
143 143
144 //============================== 144 //==============================
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 // chrome://history-frame 721 // chrome://history-frame
722 //============================== 722 //==============================
723 723
724 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestHistoryFrame) { 724 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestHistoryFrame) {
725 RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL); 725 RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
726 } 726 }
727 727
728 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestHistoryFrame) { 728 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestHistoryFrame) {
729 RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL); 729 RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
730 } 730 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698