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

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

Issue 1091253008: Fix an issue that external protocol in subframes are not handled on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix test Created 5 years, 7 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
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/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 } 1049 }
1050 ExternalProtocolHandler::BlockState GetBlockState( 1050 ExternalProtocolHandler::BlockState GetBlockState(
1051 const std::string& scheme) override { 1051 const std::string& scheme) override {
1052 // Block everything and fail the test. 1052 // Block everything and fail the test.
1053 ADD_FAILURE(); 1053 ADD_FAILURE();
1054 return ExternalProtocolHandler::BLOCK; 1054 return ExternalProtocolHandler::BLOCK;
1055 } 1055 }
1056 void BlockRequest() override {} 1056 void BlockRequest() override {}
1057 void RunExternalProtocolDialog(const GURL& url, 1057 void RunExternalProtocolDialog(const GURL& url,
1058 int render_process_host_id, 1058 int render_process_host_id,
1059 int routing_id) override { 1059 int routing_id,
1060 ui::PageTransition page_transition,
1061 bool has_user_gesture) override {
1060 NOTREACHED(); 1062 NOTREACHED();
1061 } 1063 }
1062 void LaunchUrlWithoutSecurityCheck(const GURL& url) override { NOTREACHED(); } 1064 void LaunchUrlWithoutSecurityCheck(const GURL& url) override { NOTREACHED(); }
1063 void FinishedProcessingCheck() override { NOTREACHED(); } 1065 void FinishedProcessingCheck() override { NOTREACHED(); }
1064 }; 1066 };
1065 1067
1066 base::FilePath GetTestPath(const std::string& file_name) { 1068 base::FilePath GetTestPath(const std::string& file_name) {
1067 return ui_test_utils::GetTestFilePath( 1069 return ui_test_utils::GetTestFilePath(
1068 base::FilePath(FILE_PATH_LITERAL("prerender")), 1070 base::FilePath(FILE_PATH_LITERAL("prerender")),
1069 base::FilePath().AppendASCII(file_name)); 1071 base::FilePath().AppendASCII(file_name));
(...skipping 2983 matching lines...) Expand 10 before | Expand all | Expand 10 after
4053 browser()->tab_strip_model()->GetActiveWebContents(); 4055 browser()->tab_strip_model()->GetActiveWebContents();
4054 bool display_test_result = false; 4056 bool display_test_result = false;
4055 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, 4057 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
4056 "DidDisplayReallyPass()", 4058 "DidDisplayReallyPass()",
4057 &display_test_result)); 4059 &display_test_result));
4058 ASSERT_TRUE(display_test_result); 4060 ASSERT_TRUE(display_test_result);
4059 } 4061 }
4060 #endif // !defined(DISABLE_NACL) 4062 #endif // !defined(DISABLE_NACL)
4061 4063
4062 } // namespace prerender 4064 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698