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

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 15957008: Move NaCl related switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try to fix the windows build (I don't have access to a windows machine) Created 7 years, 6 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
« no previous file with comments | « chrome/browser/plugins/plugin_prefs.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 22 matching lines...) Expand all
33 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" 33 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
34 #include "chrome/browser/ui/browser.h" 34 #include "chrome/browser/ui/browser.h"
35 #include "chrome/browser/ui/browser_commands.h" 35 #include "chrome/browser/ui/browser_commands.h"
36 #include "chrome/browser/ui/browser_finder.h" 36 #include "chrome/browser/ui/browser_finder.h"
37 #include "chrome/browser/ui/browser_window.h" 37 #include "chrome/browser/ui/browser_window.h"
38 #include "chrome/browser/ui/tabs/tab_strip_model.h" 38 #include "chrome/browser/ui/tabs/tab_strip_model.h"
39 #include "chrome/common/chrome_notification_types.h" 39 #include "chrome/common/chrome_notification_types.h"
40 #include "chrome/common/chrome_paths.h" 40 #include "chrome/common/chrome_paths.h"
41 #include "chrome/common/chrome_switches.h" 41 #include "chrome/common/chrome_switches.h"
42 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
43 #include "chrome/nacl/nacl_switches.h"
43 #include "chrome/test/base/in_process_browser_test.h" 44 #include "chrome/test/base/in_process_browser_test.h"
44 #include "chrome/test/base/ui_test_utils.h" 45 #include "chrome/test/base/ui_test_utils.h"
45 #include "content/public/browser/browser_message_filter.h" 46 #include "content/public/browser/browser_message_filter.h"
46 #include "content/public/browser/devtools_agent_host.h" 47 #include "content/public/browser/devtools_agent_host.h"
47 #include "content/public/browser/devtools_client_host.h" 48 #include "content/public/browser/devtools_client_host.h"
48 #include "content/public/browser/devtools_manager.h" 49 #include "content/public/browser/devtools_manager.h"
49 #include "content/public/browser/notification_service.h" 50 #include "content/public/browser/notification_service.h"
50 #include "content/public/browser/render_process_host.h" 51 #include "content/public/browser/render_process_host.h"
51 #include "content/public/browser/render_view_host.h" 52 #include "content/public/browser/render_view_host.h"
52 #include "content/public/browser/web_contents.h" 53 #include "content/public/browser/web_contents.h"
(...skipping 2836 matching lines...) Expand 10 before | Expand all | Expand 10 after
2889 // Checks that non-http/https main page redirects cancel the prerender. 2890 // Checks that non-http/https main page redirects cancel the prerender.
2890 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, 2891 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
2891 PrerenderCancelMainFrameRedirectUnsupportedScheme) { 2892 PrerenderCancelMainFrameRedirectUnsupportedScheme) {
2892 GURL url = test_server()->GetURL( 2893 GURL url = test_server()->GetURL(
2893 CreateServerRedirect("invalidscheme://www.google.com/test.html")); 2894 CreateServerRedirect("invalidscheme://www.google.com/test.html"));
2894 PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 1); 2895 PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 1);
2895 NavigateToDestURL(); 2896 NavigateToDestURL();
2896 } 2897 }
2897 2898
2898 } // namespace prerender 2899 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_prefs.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698