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

Side by Side Diff: chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
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_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" 21 #include "chrome/browser/ui/tabs/tab_strip_model.h"
22 #include "chrome/common/chrome_notification_types.h" 22 #include "chrome/common/chrome_notification_types.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/test/base/test_launcher_utils.h" 24 #include "chrome/test/base/test_launcher_utils.h"
25 #include "chrome/test/base/ui_test_utils.h" 25 #include "chrome/test/base/ui_test_utils.h"
26 #include "content/public/browser/gpu_data_manager.h" 26 #include "content/public/browser/gpu_data_manager.h"
27 #include "content/public/browser/notification_observer.h" 27 #include "content/public/browser/notification_observer.h"
28 #include "content/public/browser/notification_registrar.h" 28 #include "content/public/browser/notification_registrar.h"
29 #include "content/public/common/gpu_info.h" 29 #include "content/public/common/gpu_info.h"
30 #include "content/public/test/browser_test_utils.h" 30 #include "content/public/test/browser_test_utils.h"
31 #include "net/base/mock_host_resolver.h" 31 #include "net/dns/mock_host_resolver.h"
32 #include "ui/gl/gl_switches.h" 32 #include "ui/gl/gl_switches.h"
33 33
34 using content::GpuFeatureType; 34 using content::GpuFeatureType;
35 35
36 namespace utils = extension_function_test_utils; 36 namespace utils = extension_function_test_utils;
37 37
38 namespace extensions { 38 namespace extensions {
39 39
40 namespace { 40 namespace {
41 41
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 GpuFeatureType type = 479 GpuFeatureType type =
480 content::GpuDataManager::GetInstance()->GetBlacklistedFeatures(); 480 content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();
481 EXPECT_EQ((type & content::GPU_FEATURE_TYPE_WEBGL), 481 EXPECT_EQ((type & content::GPU_FEATURE_TYPE_WEBGL),
482 content::GPU_FEATURE_TYPE_WEBGL); 482 content::GPU_FEATURE_TYPE_WEBGL);
483 483
484 bool webgl_allowed = false; 484 bool webgl_allowed = false;
485 RunTest(webgl_allowed); 485 RunTest(webgl_allowed);
486 } 486 }
487 487
488 } // namespace extensions 488 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698