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

Side by Side Diff: chrome/browser/extensions/extension_resource_request_policy_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 "base/logging.h" 5 #include "base/logging.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
11 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
12 #include "content/public/test/browser_test_utils.h" 12 #include "content/public/test/browser_test_utils.h"
13 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
14 #include "net/base/mock_host_resolver.h" 14 #include "net/dns/mock_host_resolver.h"
15 15
16 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { 16 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest {
17 protected: 17 protected:
18 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 18 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
19 ExtensionApiTest::SetUpCommandLine(command_line); 19 ExtensionApiTest::SetUpCommandLine(command_line);
20 command_line->AppendSwitch(switches::kAllowLegacyExtensionManifests); 20 command_line->AppendSwitch(switches::kAllowLegacyExtensionManifests);
21 } 21 }
22 }; 22 };
23 23
24 // Note, this mostly tests the logic of chrome/renderer/extensions/ 24 // Note, this mostly tests the logic of chrome/renderer/extensions/
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 #if defined(OS_MACOSX) 268 #if defined(OS_MACOSX)
269 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources 269 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources
270 #else 270 #else
271 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources 271 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources
272 #endif 272 #endif
273 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, 273 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
274 MAYBE_ExtensionAccessibleResources) { 274 MAYBE_ExtensionAccessibleResources) {
275 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; 275 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_;
276 } 276 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698