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" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 ExtensionService* service = extensions::ExtensionSystem::Get( | 135 ExtensionService* service = extensions::ExtensionSystem::Get( |
136 browser()->profile())->extension_service(); | 136 browser()->profile())->extension_service(); |
137 const extensions::Extension* extension = | 137 const extensions::Extension* extension = |
138 service->GetExtensionById(last_loaded_extension_id(), false); | 138 service->GetExtensionById(last_loaded_extension_id(), false); |
139 GURL url = extension->GetResourceURL("newTab/a.html"); | 139 GURL url = extension->GetResourceURL("newTab/a.html"); |
140 | 140 |
141 ui_test_utils::NavigateToURL(browser(), url); | 141 ui_test_utils::NavigateToURL(browser(), url); |
142 | 142 |
143 // There's a link on a.html with target=_blank. Click on it to open it in a | 143 // There's a link on a.html with target=_blank. Click on it to open it in a |
144 // new tab. | 144 // new tab. |
145 WebKit::WebMouseEvent mouse_event; | 145 blink::WebMouseEvent mouse_event; |
146 mouse_event.type = WebKit::WebInputEvent::MouseDown; | 146 mouse_event.type = blink::WebInputEvent::MouseDown; |
147 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; | 147 mouse_event.button = blink::WebMouseEvent::ButtonLeft; |
148 mouse_event.x = 7; | 148 mouse_event.x = 7; |
149 mouse_event.y = 7; | 149 mouse_event.y = 7; |
150 mouse_event.clickCount = 1; | 150 mouse_event.clickCount = 1; |
151 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 151 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
152 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 152 mouse_event.type = blink::WebInputEvent::MouseUp; |
153 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 153 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
154 | 154 |
155 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 155 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
156 } | 156 } |
157 | 157 |
158 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestDeclarative1) { | 158 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestDeclarative1) { |
159 ASSERT_TRUE(StartEmbeddedTestServer()); | 159 ASSERT_TRUE(StartEmbeddedTestServer()); |
160 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_declarative1.html")) | 160 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_declarative1.html")) |
161 << message_; | 161 << message_; |
162 } | 162 } |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
313 // Reload extension and wait for rules to be set up again. This should not | 313 // Reload extension and wait for rules to be set up again. This should not |
314 // crash the browser. | 314 // crash the browser. |
315 ExtensionTestMessageListener listener2("done", true); | 315 ExtensionTestMessageListener listener2("done", true); |
316 ExtensionTestMessageListener listener_incognito2("done_incognito", true); | 316 ExtensionTestMessageListener listener_incognito2("done_incognito", true); |
317 | 317 |
318 ReloadExtension(extension->id()); | 318 ReloadExtension(extension->id()); |
319 | 319 |
320 EXPECT_TRUE(listener2.WaitUntilSatisfied()); | 320 EXPECT_TRUE(listener2.WaitUntilSatisfied()); |
321 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); | 321 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); |
322 } | 322 } |
OLD | NEW |