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

Side by Side Diff: chrome/browser/prerender/prerender_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 <deque> 5 #include <deque>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "content/public/browser/notification_service.h" 49 #include "content/public/browser/notification_service.h"
50 #include "content/public/browser/render_process_host.h" 50 #include "content/public/browser/render_process_host.h"
51 #include "content/public/browser/render_view_host.h" 51 #include "content/public/browser/render_view_host.h"
52 #include "content/public/browser/web_contents.h" 52 #include "content/public/browser/web_contents.h"
53 #include "content/public/common/url_constants.h" 53 #include "content/public/common/url_constants.h"
54 #include "content/public/test/browser_test_utils.h" 54 #include "content/public/test/browser_test_utils.h"
55 #include "content/public/test/test_navigation_observer.h" 55 #include "content/public/test/test_navigation_observer.h"
56 #include "content/public/test/test_utils.h" 56 #include "content/public/test/test_utils.h"
57 #include "googleurl/src/gurl.h" 57 #include "googleurl/src/gurl.h"
58 #include "grit/generated_resources.h" 58 #include "grit/generated_resources.h"
59 #include "net/base/mock_host_resolver.h" 59 #include "net/dns/mock_host_resolver.h"
60 #include "net/url_request/url_request_context.h" 60 #include "net/url_request/url_request_context.h"
61 #include "net/url_request/url_request_context_getter.h" 61 #include "net/url_request/url_request_context_getter.h"
62 #include "ui/base/l10n/l10n_util.h" 62 #include "ui/base/l10n/l10n_util.h"
63 63
64 using content::BrowserThread; 64 using content::BrowserThread;
65 using content::DevToolsAgentHost; 65 using content::DevToolsAgentHost;
66 using content::DevToolsClientHost; 66 using content::DevToolsClientHost;
67 using content::DevToolsManager; 67 using content::DevToolsManager;
68 using content::NavigationController; 68 using content::NavigationController;
69 using content::OpenURLParams; 69 using content::OpenURLParams;
(...skipping 2711 matching lines...) Expand 10 before | Expand all | Expand 10 after
2781 // Checks that non-http/https main page redirects cancel the prerender. 2781 // Checks that non-http/https main page redirects cancel the prerender.
2782 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, 2782 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
2783 PrerenderCancelMainFrameRedirectUnsupportedScheme) { 2783 PrerenderCancelMainFrameRedirectUnsupportedScheme) {
2784 GURL url = test_server()->GetURL( 2784 GURL url = test_server()->GetURL(
2785 CreateServerRedirect("invalidscheme://www.google.com/test.html")); 2785 CreateServerRedirect("invalidscheme://www.google.com/test.html"));
2786 PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 1); 2786 PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 1);
2787 NavigateToDestURL(); 2787 NavigateToDestURL();
2788 } 2788 }
2789 2789
2790 } // namespace prerender 2790 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698