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

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_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 <list> 5 #include <list>
6 #include <set> 6 #include <set>
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
11 #include "base/stringprintf.h"
12 #include "chrome/app/chrome_command_ids.h" 12 #include "chrome/app/chrome_command_ids.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chrome_browser_main.h" 14 #include "chrome/browser/chrome_browser_main.h"
15 #include "chrome/browser/chrome_browser_main_extra_parts.h" 15 #include "chrome/browser/chrome_browser_main_extra_parts.h"
16 #include "chrome/browser/chrome_content_browser_client.h" 16 #include "chrome/browser/chrome_content_browser_client.h"
17 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 17 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
18 #include "chrome/browser/extensions/extension_apitest.h" 18 #include "chrome/browser/extensions/extension_apitest.h"
19 #include "chrome/browser/extensions/extension_service.h" 19 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/extensions/extension_system.h" 20 #include "chrome/browser/extensions/extension_system.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h" 22 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"
23 #include "chrome/browser/tab_contents/render_view_context_menu.h" 23 #include "chrome/browser/tab_contents/render_view_context_menu.h"
24 #include "chrome/browser/ui/browser.h" 24 #include "chrome/browser/ui/browser.h"
25 #include "chrome/browser/ui/tabs/tab_strip_model.h" 25 #include "chrome/browser/ui/tabs/tab_strip_model.h"
26 #include "chrome/common/chrome_notification_types.h" 26 #include "chrome/common/chrome_notification_types.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "chrome/test/base/ui_test_utils.h" 28 #include "chrome/test/base/ui_test_utils.h"
29 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/render_process_host.h" 30 #include "content/public/browser/render_process_host.h"
31 #include "content/public/browser/render_view_host.h" 31 #include "content/public/browser/render_view_host.h"
32 #include "content/public/browser/resource_controller.h" 32 #include "content/public/browser/resource_controller.h"
33 #include "content/public/browser/resource_dispatcher_host.h" 33 #include "content/public/browser/resource_dispatcher_host.h"
34 #include "content/public/browser/resource_throttle.h" 34 #include "content/public/browser/resource_throttle.h"
35 #include "content/public/browser/web_contents.h" 35 #include "content/public/browser/web_contents.h"
36 #include "content/public/common/context_menu_params.h" 36 #include "content/public/common/context_menu_params.h"
37 #include "content/public/common/url_constants.h" 37 #include "content/public/common/url_constants.h"
38 #include "content/public/test/browser_test_utils.h" 38 #include "content/public/test/browser_test_utils.h"
39 #include "net/base/mock_host_resolver.h" 39 #include "net/dns/mock_host_resolver.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
42 #include "webkit/glue/resource_type.h" 42 #include "webkit/glue/resource_type.h"
43 43
44 using content::WebContents; 44 using content::WebContents;
45 45
46 namespace extensions { 46 namespace extensions {
47 47
48 namespace { 48 namespace {
49 49
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 url = GURL(base::StringPrintf( 718 url = GURL(base::StringPrintf(
719 "http://www.a.com:%d/" 719 "http://www.a.com:%d/"
720 "files/extensions/api_test/webnavigation/crash/b.html", 720 "files/extensions/api_test/webnavigation/crash/b.html",
721 test_server()->host_port_pair().port())); 721 test_server()->host_port_pair().port()));
722 ui_test_utils::NavigateToURL(browser(), url); 722 ui_test_utils::NavigateToURL(browser(), url);
723 723
724 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 724 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
725 } 725 }
726 726
727 } // namespace extensions 727 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698