| OLD | NEW |
| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| 11 #include "chrome/browser/extensions/active_tab_permission_granter.h" | 11 #include "chrome/browser/extensions/active_tab_permission_granter.h" |
| 12 #include "chrome/browser/extensions/extension_action_runner.h" | 12 #include "chrome/browser/extensions/extension_action_runner.h" |
| 13 #include "chrome/browser/extensions/extension_apitest.h" | 13 #include "chrome/browser/extensions/extension_apitest.h" |
| 14 #include "chrome/browser/extensions/extension_service.h" | 14 #include "chrome/browser/extensions/extension_service.h" |
| 15 #include "chrome/browser/extensions/tab_helper.h" | 15 #include "chrome/browser/extensions/tab_helper.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/search_engines/template_url_service_factory.h" | 17 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| 19 #include "chrome/browser/ui/browser_navigator_params.h" | 19 #include "chrome/browser/ui/browser_navigator_params.h" |
| 20 #include "chrome/browser/ui/login/login_handler.h" | 20 #include "chrome/browser/ui/login/login_handler.h" |
| 21 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 21 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 22 #include "chrome/common/extensions/extension_process_policy.h" | 22 #include "chrome/common/extensions/extension_process_policy.h" |
| 23 #include "chrome/test/base/search_test_utils.h" | 23 #include "chrome/test/base/search_test_utils.h" |
| 24 #include "chrome/test/base/ui_test_utils.h" | 24 #include "chrome/test/base/ui_test_utils.h" |
| 25 #include "chromeos/login/scoped_test_public_session_login_state.h" |
| 25 #include "content/public/browser/notification_registrar.h" | 26 #include "content/public/browser/notification_registrar.h" |
| 26 #include "content/public/browser/notification_service.h" | 27 #include "content/public/browser/notification_service.h" |
| 27 #include "content/public/browser/render_frame_host.h" | 28 #include "content/public/browser/render_frame_host.h" |
| 28 #include "content/public/browser/render_view_host.h" | 29 #include "content/public/browser/render_view_host.h" |
| 29 #include "content/public/browser/render_widget_host.h" | 30 #include "content/public/browser/render_widget_host.h" |
| 30 #include "content/public/browser/web_contents.h" | 31 #include "content/public/browser/web_contents.h" |
| 31 #include "content/public/test/browser_test_utils.h" | 32 #include "content/public/test/browser_test_utils.h" |
| 32 #include "extensions/browser/api/web_request/web_request_api.h" | 33 #include "extensions/browser/api/web_request/web_request_api.h" |
| 33 #include "extensions/browser/blocked_action_type.h" | 34 #include "extensions/browser/blocked_action_type.h" |
| 34 #include "extensions/browser/extension_system.h" | 35 #include "extensions/browser/extension_system.h" |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 } | 164 } |
| 164 | 165 |
| 165 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestTypes) { | 166 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestTypes) { |
| 166 ASSERT_TRUE(StartEmbeddedTestServer()); | 167 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 167 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_types.html")) << message_; | 168 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_types.html")) << message_; |
| 168 } | 169 } |
| 169 | 170 |
| 170 #if defined(OS_CHROMEOS) | 171 #if defined(OS_CHROMEOS) |
| 171 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestPublicSession) { | 172 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestPublicSession) { |
| 172 ASSERT_TRUE(StartEmbeddedTestServer()); | 173 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 173 // Set Public Session state. | 174 chromeos::ScopedTestPublicSessionLoginState login_state; |
| 174 chromeos::LoginState::Get()->SetLoggedInState( | |
| 175 chromeos::LoginState::LOGGED_IN_ACTIVE, | |
| 176 chromeos::LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT); | |
| 177 // Disable a CHECK while doing api tests. | 175 // Disable a CHECK while doing api tests. |
| 178 WebRequestPermissions::AllowAllExtensionLocationsInPublicSessionForTesting( | 176 WebRequestPermissions::AllowAllExtensionLocationsInPublicSessionForTesting( |
| 179 true); | 177 true); |
| 180 ASSERT_TRUE(RunExtensionSubtest("webrequest_public_session", "test.html")) << | 178 ASSERT_TRUE(RunExtensionSubtest("webrequest_public_session", "test.html")) << |
| 181 message_; | 179 message_; |
| 182 WebRequestPermissions::AllowAllExtensionLocationsInPublicSessionForTesting( | 180 WebRequestPermissions::AllowAllExtensionLocationsInPublicSessionForTesting( |
| 183 false); | 181 false); |
| 184 } | 182 } |
| 185 #endif // defined(OS_CHROMEOS) | 183 #endif // defined(OS_CHROMEOS) |
| 186 | 184 |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 // requests when authenrication is requested by server. | 659 // requests when authenrication is requested by server. |
| 662 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, | 660 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |
| 663 WebSocketRequestAuthRequired) { | 661 WebSocketRequestAuthRequired) { |
| 664 ASSERT_TRUE(StartEmbeddedTestServer()); | 662 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 665 ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory(), true)); | 663 ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory(), true)); |
| 666 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_websocket_auth.html")) | 664 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_websocket_auth.html")) |
| 667 << message_; | 665 << message_; |
| 668 } | 666 } |
| 669 | 667 |
| 670 } // namespace extensions | 668 } // namespace extensions |
| OLD | NEW |