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

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

Issue 15745014: Move GPU device/driver info related code from content to gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
===================================================================
--- chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc (revision 201645)
+++ chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc (working copy)
@@ -26,13 +26,13 @@
#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_feature_type.h"
-#include "content/public/common/gpu_info.h"
#include "content/public/test/browser_test_utils.h"
+#include "gpu/config/gpu_feature_type.h"
+#include "gpu/config/gpu_info.h"
#include "net/dns/mock_host_resolver.h"
#include "ui/gl/gl_switches.h"
-using content::GpuFeatureType;
+using gpu::GpuFeatureType;
namespace utils = extension_function_test_utils;
@@ -484,11 +484,11 @@
" }\n"
" ]\n"
"}";
- content::GPUInfo gpu_info;
+ gpu::GPUInfo gpu_info;
content::GpuDataManager::GetInstance()->InitializeForTesting(
json_blacklist, gpu_info);
EXPECT_TRUE(content::GpuDataManager::GetInstance()->IsFeatureBlacklisted(
- content::GPU_FEATURE_TYPE_WEBGL));
+ gpu::GPU_FEATURE_TYPE_WEBGL));
bool webgl_allowed = false;
RunTest(webgl_allowed);

Powered by Google App Engine
This is Rietveld 408576698