| 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/login_state.h" | |
| 26 #include "content/public/browser/notification_registrar.h" | 25 #include "content/public/browser/notification_registrar.h" |
| 27 #include "content/public/browser/notification_service.h" | 26 #include "content/public/browser/notification_service.h" |
| 28 #include "content/public/browser/render_frame_host.h" | 27 #include "content/public/browser/render_frame_host.h" |
| 29 #include "content/public/browser/render_view_host.h" | 28 #include "content/public/browser/render_view_host.h" |
| 30 #include "content/public/browser/render_widget_host.h" | 29 #include "content/public/browser/render_widget_host.h" |
| 31 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
| 32 #include "content/public/test/browser_test_utils.h" | 31 #include "content/public/test/browser_test_utils.h" |
| 33 #include "extensions/browser/api/web_request/web_request_api.h" | 32 #include "extensions/browser/api/web_request/web_request_api.h" |
| 34 #include "extensions/browser/blocked_action_type.h" | 33 #include "extensions/browser/blocked_action_type.h" |
| 35 #include "extensions/browser/extension_system.h" | 34 #include "extensions/browser/extension_system.h" |
| 36 #include "extensions/common/extension_builder.h" | 35 #include "extensions/common/extension_builder.h" |
| 37 #include "extensions/common/features/feature.h" | 36 #include "extensions/common/features/feature.h" |
| 38 #include "extensions/test/extension_test_message_listener.h" | 37 #include "extensions/test/extension_test_message_listener.h" |
| 39 #include "extensions/test/result_catcher.h" | 38 #include "extensions/test/result_catcher.h" |
| 40 #include "net/dns/mock_host_resolver.h" | 39 #include "net/dns/mock_host_resolver.h" |
| 41 #include "net/test/embedded_test_server/embedded_test_server.h" | 40 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 42 #include "net/test/test_data_directory.h" | 41 #include "net/test/test_data_directory.h" |
| 43 #include "third_party/WebKit/public/platform/WebInputEvent.h" | 42 #include "third_party/WebKit/public/platform/WebInputEvent.h" |
| 44 | 43 |
| 44 #if defined(OS_CHROMEOS) |
| 45 #include "chromeos/login/login_state.h" |
| 46 #endif // defined(OS_CHROMEOS) |
| 47 |
| 45 using content::WebContents; | 48 using content::WebContents; |
| 46 | 49 |
| 47 namespace extensions { | 50 namespace extensions { |
| 48 | 51 |
| 49 namespace { | 52 namespace { |
| 50 | 53 |
| 51 class CancelLoginDialog : public content::NotificationObserver { | 54 class CancelLoginDialog : public content::NotificationObserver { |
| 52 public: | 55 public: |
| 53 CancelLoginDialog() { | 56 CancelLoginDialog() { |
| 54 registrar_.Add(this, | 57 registrar_.Add(this, |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 // requests when authenrication is requested by server. | 661 // requests when authenrication is requested by server. |
| 659 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, | 662 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |
| 660 WebSocketRequestAuthRequired) { | 663 WebSocketRequestAuthRequired) { |
| 661 ASSERT_TRUE(StartEmbeddedTestServer()); | 664 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 662 ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory(), true)); | 665 ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory(), true)); |
| 663 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_websocket_auth.html")) | 666 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_websocket_auth.html")) |
| 664 << message_; | 667 << message_; |
| 665 } | 668 } |
| 666 | 669 |
| 667 } // namespace extensions | 670 } // namespace extensions |
| OLD | NEW |