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

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

Issue 10270023: Add new ResourceBundle::Delegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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_mac.mm ('k') | chrome/app/chrome_main_delegate.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 "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 17 matching lines...) Expand all
28 28
29 gfx::RegisterPathProvider(); 29 gfx::RegisterPathProvider();
30 ui::RegisterPathProvider(); 30 ui::RegisterPathProvider();
31 31
32 #if defined(OS_MACOSX) 32 #if defined(OS_MACOSX)
33 ash::test::OverrideFrameworkBundle(); 33 ash::test::OverrideFrameworkBundle();
34 #endif 34 #endif
35 35
36 // Force unittests to run using en-US so if we test against string 36 // Force unittests to run using en-US so if we test against string
37 // output, it'll pass regardless of the system language. 37 // output, it'll pass regardless of the system language.
38 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US"); 38 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
39 ui::CompositorTestSupport::Initialize(); 39 ui::CompositorTestSupport::Initialize();
40 ui::SetupTestCompositor(); 40 ui::SetupTestCompositor();
41 } 41 }
42 42
43 void AuraShellTestSuite::Shutdown() { 43 void AuraShellTestSuite::Shutdown() {
44 ui::CompositorTestSupport::Terminate(); 44 ui::CompositorTestSupport::Terminate();
45 ui::ResourceBundle::CleanupSharedInstance(); 45 ui::ResourceBundle::CleanupSharedInstance();
46 base::TestSuite::Shutdown(); 46 base::TestSuite::Shutdown();
47 } 47 }
48 48
49 } // namespace test 49 } // namespace test
50 } // namespace ash 50 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/shell_main_parts_mac.mm ('k') | chrome/app/chrome_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698