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

Unified Diff: chrome/browser/extensions/extension_service_unittest.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
Index: chrome/browser/extensions/extension_service_unittest.cc
===================================================================
--- chrome/browser/extensions/extension_service_unittest.cc (revision 156701)
+++ chrome/browser/extensions/extension_service_unittest.cc (working copy)
@@ -74,6 +74,7 @@
#include "content/public/browser/plugin_service.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/common/content_constants.h"
+#include "content/public/common/gpu_info.h"
#include "content/public/test/test_browser_thread.h"
#include "googleurl/src/gurl.h"
#include "grit/browser_resources.h"
@@ -731,7 +732,9 @@
" }\n"
" ]\n"
"}";
- content::GpuDataManager::GetInstance()->Initialize("0", json_blacklist);
+ content::GPUInfo gpu_info;
+ content::GpuDataManager::GetInstance()->InitializeForTesting(
+ json_blacklist, gpu_info);
}
void UpdateExtension(const std::string& id, const FilePath& in_path,

Powered by Google App Engine
This is Rietveld 408576698