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

Side by Side Diff: ash/test/test_suite.cc

Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 | « ash/shell/shell_main_parts.cc ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | 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 "ash/test/test_suite.h" 5 #include "ash/test/test_suite.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 if (version >= base::win::VERSION_WIN8) 44 if (version >= base::win::VERSION_WIN8)
45 ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously()); 45 ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously());
46 } 46 }
47 #endif 47 #endif
48 48
49 gfx::RegisterPathProvider(); 49 gfx::RegisterPathProvider();
50 ui::RegisterPathProvider(); 50 ui::RegisterPathProvider();
51 51
52 // Force unittests to run using en-US so if we test against string 52 // Force unittests to run using en-US so if we test against string
53 // output, it'll pass regardless of the system language. 53 // output, it'll pass regardless of the system language.
54 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 54 ui::ResourceBundle::InitSharedInstanceWithLocale(
55 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
55 } 56 }
56 57
57 void AuraShellTestSuite::Shutdown() { 58 void AuraShellTestSuite::Shutdown() {
58 ui::ResourceBundle::CleanupSharedInstance(); 59 ui::ResourceBundle::CleanupSharedInstance();
59 #if defined(OS_WIN) 60 #if defined(OS_WIN)
60 com_initializer_.reset(); 61 com_initializer_.reset();
61 #endif 62 #endif
62 base::TestSuite::Shutdown(); 63 base::TestSuite::Shutdown();
63 } 64 }
64 65
65 } // namespace test 66 } // namespace test
66 } // namespace ash 67 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/shell_main_parts.cc ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698