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

Side by Side Diff: extensions/test/extensions_unittests_main.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, 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
« no previous file with comments | « content/test/content_test_suite.cc ('k') | gpu/command_buffer/client/gl_in_process_context.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <memory> 5 #include <memory>
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 DISALLOW_COPY_AND_ASSIGN(ExtensionsTestSuite); 72 DISALLOW_COPY_AND_ASSIGN(ExtensionsTestSuite);
73 }; 73 };
74 74
75 ExtensionsTestSuite::ExtensionsTestSuite(int argc, char** argv) 75 ExtensionsTestSuite::ExtensionsTestSuite(int argc, char** argv)
76 : content::ContentTestSuiteBase(argc, argv) {} 76 : content::ContentTestSuiteBase(argc, argv) {}
77 77
78 ExtensionsTestSuite::~ExtensionsTestSuite() {} 78 ExtensionsTestSuite::~ExtensionsTestSuite() {}
79 79
80 void ExtensionsTestSuite::Initialize() { 80 void ExtensionsTestSuite::Initialize() {
81 content::ContentTestSuiteBase::Initialize(); 81 content::ContentTestSuiteBase::Initialize();
82 gfx::GLSurfaceTestSupport::InitializeOneOff(); 82 gl::GLSurfaceTestSupport::InitializeOneOff();
83 83
84 // Register the chrome-extension:// scheme via this circuitous path. Note 84 // Register the chrome-extension:// scheme via this circuitous path. Note
85 // that this does not persistently set up a ContentClient; individual tests 85 // that this does not persistently set up a ContentClient; individual tests
86 // must use content::SetContentClient(). 86 // must use content::SetContentClient().
87 { 87 {
88 ExtensionsContentClient content_client; 88 ExtensionsContentClient content_client;
89 RegisterContentSchemes(&content_client); 89 RegisterContentSchemes(&content_client);
90 } 90 }
91 RegisterInProcessThreads(); 91 RegisterInProcessThreads();
92 92
(...skipping 24 matching lines...) Expand all
117 117
118 mojo::edk::Init(); 118 mojo::edk::Init();
119 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); 119 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
120 mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); 120 mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner());
121 121
122 return base::LaunchUnitTests(argc, 122 return base::LaunchUnitTests(argc,
123 argv, 123 argv,
124 base::Bind(&content::UnitTestTestSuite::Run, 124 base::Bind(&content::UnitTestTestSuite::Run,
125 base::Unretained(&test_suite))); 125 base::Unretained(&test_suite)));
126 } 126 }
OLDNEW
« no previous file with comments | « content/test/content_test_suite.cc ('k') | gpu/command_buffer/client/gl_in_process_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698