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

Unified Diff: content/common/gpu/gpu_channel_test_common.h

Issue 1716813002: Use GpuPreferences to avoid directly accessing switches in gpu related code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_channel_test_common.h
diff --git a/content/common/gpu/gpu_channel_test_common.h b/content/common/gpu/gpu_channel_test_common.h
index fc56738f3e177aaeb3e279d42795d9fe69e6deb2..ce7a23d737819e041685642c795b663e04c23812 100644
--- a/content/common/gpu/gpu_channel_test_common.h
+++ b/content/common/gpu/gpu_channel_test_common.h
@@ -8,6 +8,7 @@
#include "content/common/gpu/gpu_channel.h"
#include "content/common/gpu/gpu_channel_manager.h"
#include "content/common/gpu/gpu_channel_manager_delegate.h"
+#include "gpu/command_buffer/service/gpu_preferences.h"
#include "ipc/ipc_test_sink.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -64,7 +65,8 @@ class TestGpuChannelManagerDelegate : public GpuChannelManagerDelegate {
class TestGpuChannelManager : public GpuChannelManager {
public:
- TestGpuChannelManager(GpuChannelManagerDelegate* delegate,
+ TestGpuChannelManager(const gpu::GpuPreferences& gpu_preferences,
+ GpuChannelManagerDelegate* delegate,
base::SingleThreadTaskRunner* task_runner,
base::SingleThreadTaskRunner* io_task_runner,
gpu::SyncPointManager* sync_point_manager,
@@ -121,6 +123,7 @@ class GpuChannelTestCommon : public testing::Test {
base::TestSimpleTaskRunner* task_runner() { return task_runner_.get(); }
private:
+ gpu::GpuPreferences gpu_preferences_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
scoped_refptr<base::TestSimpleTaskRunner> io_task_runner_;
scoped_ptr<gpu::SyncPointManager> sync_point_manager_;

Powered by Google App Engine
This is Rietveld 408576698