| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "chrome/browser/browser_thread.h" | 7 #include "chrome/browser/browser_thread.h" |
| 8 #include "chrome/browser/child_process_security_policy.h" | 8 #include "chrome/browser/child_process_security_policy.h" |
| 9 #include "chrome/browser/chromeos/login/account_screen.h" | 9 #include "chrome/browser/chromeos/login/account_screen.h" |
| 10 #include "chrome/browser/chromeos/login/wizard_controller.h" | 10 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 NewRunnableFunction(QuitUIMessageLoop)); | 74 NewRunnableFunction(QuitUIMessageLoop)); |
| 75 | 75 |
| 76 // Do not navigate to the given URL. Navigate to about:blank instead. | 76 // Do not navigate to the given URL. Navigate to about:blank instead. |
| 77 return new net::URLRequestAboutJob(request); | 77 return new net::URLRequestAboutJob(request); |
| 78 } | 78 } |
| 79 | 79 |
| 80 // Sometimes times out: http://crbug.com/60050. | 80 // Sometimes times out: http://crbug.com/60050. |
| 81 IN_PROC_BROWSER_TEST_F(AccountScreenTest, DISABLED_TestSchemeInspector) { | 81 IN_PROC_BROWSER_TEST_F(AccountScreenTest, DISABLED_TestSchemeInspector) { |
| 82 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 82 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 83 chrome::kCrosScheme); | 83 chrome::kCrosScheme); |
| 84 URLRequestFilter::GetInstance()->AddHostnameHandler(chrome::kCrosScheme, | 84 net::URLRequestFilter::GetInstance()->AddHostnameHandler(chrome::kCrosScheme, |
| 85 "inspector", | 85 "inspector", |
| 86 &InspectorHook); | 86 &InspectorHook); |
| 87 EXPECT_FALSE(inspector_called); | 87 EXPECT_FALSE(inspector_called); |
| 88 ui_test_utils::RunMessageLoop(); | 88 ui_test_utils::RunMessageLoop(); |
| 89 EXPECT_TRUE(inspector_called); | 89 EXPECT_TRUE(inspector_called); |
| 90 } | 90 } |
| 91 | 91 |
| 92 } // namespace chromeos | 92 } // namespace chromeos |
| OLD | NEW |