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

Side by Side Diff: chrome/browser/extensions/extension_nacl_browsertest.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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/crx_installer.h" 10 #include "chrome/browser/extensions/crx_installer.h"
11 #include "chrome/browser/extensions/extension_browsertest.h" 11 #include "chrome/browser/extensions/extension_browsertest.h"
12 #include "chrome/browser/extensions/extension_service.h" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/extensions/extension_system.h" 13 #include "chrome/browser/extensions/extension_system.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model.h"
17 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/test/base/ui_test_utils.h" 20 #include "chrome/test/base/ui_test_utils.h"
21 #include "content/public/browser/plugin_service.h" 21 #include "content/public/browser/plugin_service.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "content/public/test/browser_test_utils.h" 23 #include "content/public/test/browser_test_utils.h"
24 #include "net/base/mock_host_resolver.h" 24 #include "net/dns/mock_host_resolver.h"
25 #include "webkit/plugins/webplugininfo.h" 25 #include "webkit/plugins/webplugininfo.h"
26 26
27 using content::PluginService; 27 using content::PluginService;
28 using content::WebContents; 28 using content::WebContents;
29 using extensions::Extension; 29 using extensions::Extension;
30 using extensions::Manifest; 30 using extensions::Manifest;
31 31
32 namespace { 32 namespace {
33 33
34 const char* kExtensionId = "bjjcibdiodkkeanflmiijlcfieiemced"; 34 const char* kExtensionId = "bjjcibdiodkkeanflmiijlcfieiemced";
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 replace_host.SetHostStr(host_str); 193 replace_host.SetHostStr(host_str);
194 replace_host.ClearPort(); 194 replace_host.ClearPort();
195 url = url.ReplaceComponents(replace_host); 195 url = url.ReplaceComponents(replace_host);
196 196
197 const Extension* extension = InstallHostedApp(); 197 const Extension* extension = InstallHostedApp();
198 ASSERT_TRUE(extension); 198 ASSERT_TRUE(extension);
199 CheckPluginsCreated(url, true); 199 CheckPluginsCreated(url, true);
200 } 200 }
201 201
202 } // namespace 202 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698