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

Side by Side Diff: content/test/content_test_suite.cc

Issue 2525483005: Remove SurfaceTextureManager (Closed)
Patch Set: Updated a comment in GpuSurfaceTracker Created 4 years 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 "content/test/content_test_suite.h" 5 #include "content/test/content_test_suite.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 12 matching lines...) Expand all
23 #include "ui/display/win/dpi.h" 23 #include "ui/display/win/dpi.h"
24 #endif 24 #endif
25 25
26 #if defined(OS_MACOSX) 26 #if defined(OS_MACOSX)
27 #include "base/mac/scoped_nsautorelease_pool.h" 27 #include "base/mac/scoped_nsautorelease_pool.h"
28 #include "base/test/mock_chrome_application_mac.h" 28 #include "base/test/mock_chrome_application_mac.h"
29 #endif 29 #endif
30 30
31 #if defined(OS_ANDROID) 31 #if defined(OS_ANDROID)
32 #include "content/browser/media/android/browser_media_player_manager.h" 32 #include "content/browser/media/android/browser_media_player_manager.h"
33 #include "gpu/ipc/client/android/in_process_surface_texture_manager.h"
34 #endif 33 #endif
35 34
36 namespace content { 35 namespace content {
37 namespace { 36 namespace {
38 37
39 class TestInitializationListener : public testing::EmptyTestEventListener { 38 class TestInitializationListener : public testing::EmptyTestEventListener {
40 public: 39 public:
41 TestInitializationListener() : test_content_client_initializer_(NULL) { 40 TestInitializationListener() : test_content_client_initializer_(NULL) {
42 } 41 }
43 42
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 gpu::GPUInfo gpu_info; 89 gpu::GPUInfo gpu_info;
91 gpu::CollectBasicGraphicsInfo(&gpu_info); 90 gpu::CollectBasicGraphicsInfo(&gpu_info);
92 gpu::ApplyGpuDriverBugWorkarounds(gpu_info, 91 gpu::ApplyGpuDriverBugWorkarounds(gpu_info,
93 base::CommandLine::ForCurrentProcess()); 92 base::CommandLine::ForCurrentProcess());
94 gl::GLSurfaceTestSupport::InitializeOneOff(); 93 gl::GLSurfaceTestSupport::InitializeOneOff();
95 } 94 }
96 testing::TestEventListeners& listeners = 95 testing::TestEventListeners& listeners =
97 testing::UnitTest::GetInstance()->listeners(); 96 testing::UnitTest::GetInstance()->listeners();
98 listeners.Append(new TestInitializationListener); 97 listeners.Append(new TestInitializationListener);
99 #if defined(OS_ANDROID) 98 #if defined(OS_ANDROID)
100 gpu::SurfaceTextureManager::SetInstance(
101 gpu::InProcessSurfaceTextureManager::GetInstance());
102 content::BrowserMediaPlayerManager::InitSurfaceTexturePeer(); 99 content::BrowserMediaPlayerManager::InitSurfaceTexturePeer();
103 #endif 100 #endif
104 } 101 }
105 102
106 } // namespace content 103 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698