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

Side by Side Diff: mash/test/mash_test_suite.cc

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 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
« no previous file with comments | « mash/session/BUILD.gn ('k') | mash/wm/BUILD.gn » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "mash/test/mash_test_suite.h" 5 #include "mash/test/mash_test_suite.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "ui/aura/env.h" 9 #include "ui/aura/env.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 10 matching lines...) Expand all
21 21
22 void MashTestSuite::Initialize() { 22 void MashTestSuite::Initialize() {
23 base::TestSuite::Initialize(); 23 base::TestSuite::Initialize();
24 gl::GLSurfaceTestSupport::InitializeOneOff(); 24 gl::GLSurfaceTestSupport::InitializeOneOff();
25 25
26 // Load ash resources and en-US strings; not 'common' (Chrome) resources. 26 // Load ash resources and en-US strings; not 'common' (Chrome) resources.
27 // TODO(msw): Check ResourceBundle::IsScaleFactorSupported; load 300% etc. 27 // TODO(msw): Check ResourceBundle::IsScaleFactorSupported; load 300% etc.
28 base::FilePath path; 28 base::FilePath path;
29 PathService::Get(base::DIR_MODULE, &path); 29 PathService::Get(base::DIR_MODULE, &path);
30 base::FilePath mash_test_strings = 30 base::FilePath mash_test_strings =
31 path.Append(FILE_PATH_LITERAL("mash_wm_resources.pak")); 31 path.Append(FILE_PATH_LITERAL("ash_mus_resources.pak"));
32 32
33 ui::ResourceBundle::InitSharedInstanceWithPakPath(mash_test_strings); 33 ui::ResourceBundle::InitSharedInstanceWithPakPath(mash_test_strings);
34 34
35 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); 35 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
36 env_ = aura::Env::CreateInstance(); 36 env_ = aura::Env::CreateInstance();
37 37
38 const bool enable_pixel_output = false; 38 const bool enable_pixel_output = false;
39 env_->set_context_factory( 39 env_->set_context_factory(
40 ui::InitializeContextFactoryForTests(enable_pixel_output)); 40 ui::InitializeContextFactoryForTests(enable_pixel_output));
41 } 41 }
42 42
43 void MashTestSuite::Shutdown() { 43 void MashTestSuite::Shutdown() {
44 env_.reset(); 44 env_.reset();
45 ui::ResourceBundle::CleanupSharedInstance(); 45 ui::ResourceBundle::CleanupSharedInstance();
46 ui::TerminateContextFactoryForTests(); 46 ui::TerminateContextFactoryForTests();
47 base::TestSuite::Shutdown(); 47 base::TestSuite::Shutdown();
48 } 48 }
49 49
50 } // namespace test 50 } // namespace test
51 } // namespace mash 51 } // namespace mash
OLDNEW
« no previous file with comments | « mash/session/BUILD.gn ('k') | mash/wm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698