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

Side by Side Diff: chrome/browser/extensions/extension_webstore_private_apitest.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <vector> 5 #include <vector>
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "chrome/browser/extensions/bundle_installer.h" 10 #include "chrome/browser/extensions/bundle_installer.h"
11 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
12 #include "chrome/browser/extensions/extension_function_test_utils.h" 12 #include "chrome/browser/extensions/extension_function_test_utils.h"
13 #include "chrome/browser/extensions/extension_install_dialog.h" 13 #include "chrome/browser/extensions/extension_install_dialog.h"
14 #include "chrome/browser/extensions/extension_install_ui.h" 14 #include "chrome/browser/extensions/extension_install_ui.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/extensions/extension_webstore_private_api.h" 16 #include "chrome/browser/extensions/extension_webstore_private_api.h"
17 #include "chrome/browser/extensions/webstore_installer.h" 17 #include "chrome/browser/extensions/webstore_installer.h"
18 #include "chrome/browser/gpu_blacklist.h" 18 #include "chrome/browser/gpu_blacklist.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
21 #include "chrome/common/chrome_notification_types.h" 21 #include "chrome/common/chrome_notification_types.h"
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "chrome/test/base/test_launcher_utils.h" 23 #include "chrome/test/base/test_launcher_utils.h"
24 #include "chrome/test/base/ui_test_utils.h" 24 #include "chrome/test/base/ui_test_utils.h"
25 #include "content/public/browser/gpu_data_manager.h" 25 #include "content/public/browser/gpu_data_manager.h"
26 #include "content/public/browser/notification_observer.h" 26 #include "content/public/browser/notification_observer.h"
27 #include "content/public/browser/notification_registrar.h" 27 #include "content/public/browser/notification_registrar.h"
28 #include "net/base/mock_host_resolver.h" 28 #include "net/base/mock_host_resolver.h"
29 #include "ui/gfx/gl/gl_switches.h" 29 #include "ui/gl/gl_switches.h"
30 30
31 using content::GpuFeatureType; 31 using content::GpuFeatureType;
32 32
33 namespace utils = extension_function_test_utils; 33 namespace utils = extension_function_test_utils;
34 34
35 namespace { 35 namespace {
36 36
37 class WebstoreInstallListener : public WebstoreInstaller::Delegate { 37 class WebstoreInstallListener : public WebstoreInstaller::Delegate {
38 public: 38 public:
39 WebstoreInstallListener() 39 WebstoreInstallListener()
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 ASSERT_TRUE(blacklist->LoadGpuBlacklist( 457 ASSERT_TRUE(blacklist->LoadGpuBlacklist(
458 json_blacklist, GpuBlacklist::kAllOs)); 458 json_blacklist, GpuBlacklist::kAllOs));
459 blacklist->UpdateGpuDataManager(); 459 blacklist->UpdateGpuDataManager();
460 GpuFeatureType type = 460 GpuFeatureType type =
461 content::GpuDataManager::GetInstance()->GetGpuFeatureType(); 461 content::GpuDataManager::GetInstance()->GetGpuFeatureType();
462 EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL); 462 EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
463 463
464 bool webgl_allowed = false; 464 bool webgl_allowed = false;
465 RunTest(webgl_allowed); 465 RunTest(webgl_allowed);
466 } 466 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698