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 "chrome/browser/chrome_notification_types.h" | 6 #include "chrome/browser/chrome_notification_types.h" |
7 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 7 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
11 #include "chrome/browser/extensions/extension_test_message_listener.h" | 11 #include "chrome/browser/extensions/extension_test_message_listener.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/login/login_prompt.h" | 14 #include "chrome/browser/ui/login/login_prompt.h" |
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
16 #include "chrome/common/chrome_switches.h" | |
17 #include "chrome/common/extensions/features/feature.h" | 16 #include "chrome/common/extensions/features/feature.h" |
18 #include "chrome/test/base/ui_test_utils.h" | 17 #include "chrome/test/base/ui_test_utils.h" |
19 #include "content/public/browser/notification_registrar.h" | 18 #include "content/public/browser/notification_registrar.h" |
20 #include "content/public/browser/notification_service.h" | 19 #include "content/public/browser/notification_service.h" |
21 #include "content/public/browser/render_view_host.h" | 20 #include "content/public/browser/render_view_host.h" |
22 #include "content/public/browser/web_contents.h" | 21 #include "content/public/browser/web_contents.h" |
23 #include "content/public/test/browser_test_utils.h" | 22 #include "content/public/test/browser_test_utils.h" |
24 #include "net/dns/mock_host_resolver.h" | 23 #include "net/dns/mock_host_resolver.h" |
25 #include "net/test/embedded_test_server/embedded_test_server.h" | 24 #include "net/test/embedded_test_server/embedded_test_server.h" |
26 #include "third_party/WebKit/public/web/WebInputEvent.h" | 25 #include "third_party/WebKit/public/web/WebInputEvent.h" |
(...skipping 25 matching lines...) Expand all Loading... |
52 content::NotificationRegistrar registrar_; | 51 content::NotificationRegistrar registrar_; |
53 | 52 |
54 DISALLOW_COPY_AND_ASSIGN(CancelLoginDialog); | 53 DISALLOW_COPY_AND_ASSIGN(CancelLoginDialog); |
55 }; | 54 }; |
56 | 55 |
57 } // namespace | 56 } // namespace |
58 | 57 |
59 class ExtensionWebRequestApiTest : public ExtensionApiTest { | 58 class ExtensionWebRequestApiTest : public ExtensionApiTest { |
60 public: | 59 public: |
61 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 60 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
62 // TODO(battre): remove this when declarative webRequest API becomes stable. | |
63 CommandLine::ForCurrentProcess()->AppendSwitch( | |
64 switches::kEnableExperimentalExtensionApis); | |
65 | |
66 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 61 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
67 host_resolver()->AddRule("*", "127.0.0.1"); | 62 host_resolver()->AddRule("*", "127.0.0.1"); |
68 } | 63 } |
69 | 64 |
70 void RunPermissionTest( | 65 void RunPermissionTest( |
71 const char* extension_directory, | 66 const char* extension_directory, |
72 bool load_extension_with_incognito_permission, | 67 bool load_extension_with_incognito_permission, |
73 bool wait_for_extension_loaded_in_incognito, | 68 bool wait_for_extension_loaded_in_incognito, |
74 const char* expected_content_regular_window, | 69 const char* expected_content_regular_window, |
75 const char* exptected_content_incognito_window); | 70 const char* exptected_content_incognito_window); |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 // Reload extension and wait for rules to be set up again. This should not | 314 // Reload extension and wait for rules to be set up again. This should not |
320 // crash the browser. | 315 // crash the browser. |
321 ExtensionTestMessageListener listener2("done", true); | 316 ExtensionTestMessageListener listener2("done", true); |
322 ExtensionTestMessageListener listener_incognito2("done_incognito", true); | 317 ExtensionTestMessageListener listener_incognito2("done_incognito", true); |
323 | 318 |
324 ReloadExtension(extension->id()); | 319 ReloadExtension(extension->id()); |
325 | 320 |
326 EXPECT_TRUE(listener2.WaitUntilSatisfied()); | 321 EXPECT_TRUE(listener2.WaitUntilSatisfied()); |
327 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); | 322 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); |
328 } | 323 } |
OLD | NEW |