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

Unified Diff: chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

Issue 10911315: Move gpu blacklist data file to content side. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
« no previous file with comments | « chrome/browser/chrome_gpu_util.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
===================================================================
--- chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc (revision 156701)
+++ chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc (working copy)
@@ -25,6 +25,7 @@
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
+#include "content/public/common/gpu_info.h"
#include "net/base/mock_host_resolver.h"
#include "ui/gl/gl_switches.h"
@@ -435,7 +436,9 @@
" }\n"
" ]\n"
"}";
- content::GpuDataManager::GetInstance()->Initialize("0", json_blacklist);
+ content::GPUInfo gpu_info;
+ content::GpuDataManager::GetInstance()->InitializeForTesting(
+ json_blacklist, gpu_info);
GpuFeatureType type =
content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
« no previous file with comments | « chrome/browser/chrome_gpu_util.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698