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

Side by Side Diff: ui/views/views_test_suite.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
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 "ui/views/views_test_suite.h" 5 #include "ui/views/views_test_suite.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 22 matching lines...) Expand all
33 argc_, argv_, base::Bind(&ViewsTestSuite::Run, base::Unretained(this))); 33 argc_, argv_, base::Bind(&ViewsTestSuite::Run, base::Unretained(this)));
34 } 34 }
35 35
36 int ViewsTestSuite::RunTestsSerially() { 36 int ViewsTestSuite::RunTestsSerially() {
37 return base::LaunchUnitTestsSerially( 37 return base::LaunchUnitTestsSerially(
38 argc_, argv_, base::Bind(&ViewsTestSuite::Run, base::Unretained(this))); 38 argc_, argv_, base::Bind(&ViewsTestSuite::Run, base::Unretained(this)));
39 } 39 }
40 40
41 void ViewsTestSuite::Initialize() { 41 void ViewsTestSuite::Initialize() {
42 base::TestSuite::Initialize(); 42 base::TestSuite::Initialize();
43 gfx::GLSurfaceTestSupport::InitializeOneOff(); 43 gl::GLSurfaceTestSupport::InitializeOneOff();
44 ui::RegisterPathProvider(); 44 ui::RegisterPathProvider();
45 45
46 base::FilePath ui_test_pak_path; 46 base::FilePath ui_test_pak_path;
47 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); 47 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
48 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); 48 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
49 #if defined(USE_AURA) 49 #if defined(USE_AURA)
50 env_ = aura::Env::CreateInstance(); 50 env_ = aura::Env::CreateInstance();
51 #endif 51 #endif
52 } 52 }
53 53
54 void ViewsTestSuite::Shutdown() { 54 void ViewsTestSuite::Shutdown() {
55 #if defined(USE_AURA) 55 #if defined(USE_AURA)
56 env_.reset(); 56 env_.reset();
57 #endif 57 #endif
58 ui::ResourceBundle::CleanupSharedInstance(); 58 ui::ResourceBundle::CleanupSharedInstance();
59 base::TestSuite::Shutdown(); 59 base::TestSuite::Shutdown();
60 } 60 }
61 61
62 } // namespace views 62 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698