| Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
|
| index bb0a7d090641e1b61acd5649f10d22e0f8c6cd06..9767b235568bd6218b9c0b7cec58e8abef22895f 100644
|
| --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
|
| +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
|
| @@ -542,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_UserAction) {
|
| // This corresponds to "Open link in new tab".
|
| content::ContextMenuParams params;
|
| params.is_editable = false;
|
| - params.media_type = WebKit::WebContextMenuData::MediaTypeNone;
|
| + params.media_type = blink::WebContextMenuData::MediaTypeNone;
|
| params.page_url = url;
|
| params.frame_id = WebNavigationTabObserver::Get(tab)->
|
| frame_navigation_state().GetMainFrameID().frame_num;
|
| @@ -582,14 +582,14 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_RequestOpenTab) {
|
| ui_test_utils::NavigateToURL(browser(), url);
|
|
|
| // There's a link on a.html. Middle-click on it to open it in a new tab.
|
| - WebKit::WebMouseEvent mouse_event;
|
| - mouse_event.type = WebKit::WebInputEvent::MouseDown;
|
| - mouse_event.button = WebKit::WebMouseEvent::ButtonMiddle;
|
| + blink::WebMouseEvent mouse_event;
|
| + mouse_event.type = blink::WebInputEvent::MouseDown;
|
| + mouse_event.button = blink::WebMouseEvent::ButtonMiddle;
|
| mouse_event.x = 7;
|
| mouse_event.y = 7;
|
| mouse_event.clickCount = 1;
|
| tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
|
| - mouse_event.type = WebKit::WebInputEvent::MouseUp;
|
| + mouse_event.type = blink::WebInputEvent::MouseUp;
|
| tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
|
|
|
| ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
|
| @@ -621,14 +621,14 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_TargetBlank) {
|
|
|
| // There's a link with target=_blank on a.html. Click on it to open it in a
|
| // new tab.
|
| - WebKit::WebMouseEvent mouse_event;
|
| - mouse_event.type = WebKit::WebInputEvent::MouseDown;
|
| - mouse_event.button = WebKit::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent mouse_event;
|
| + mouse_event.type = blink::WebInputEvent::MouseDown;
|
| + mouse_event.button = blink::WebMouseEvent::ButtonLeft;
|
| mouse_event.x = 7;
|
| mouse_event.y = 7;
|
| mouse_event.clickCount = 1;
|
| tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
|
| - mouse_event.type = WebKit::WebInputEvent::MouseUp;
|
| + mouse_event.type = blink::WebInputEvent::MouseUp;
|
| tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
|
|
|
| ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
|
| @@ -659,14 +659,14 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_TargetBlankIncognito) {
|
|
|
| // There's a link with target=_blank on a.html. Click on it to open it in a
|
| // new tab.
|
| - WebKit::WebMouseEvent mouse_event;
|
| - mouse_event.type = WebKit::WebInputEvent::MouseDown;
|
| - mouse_event.button = WebKit::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent mouse_event;
|
| + mouse_event.type = blink::WebInputEvent::MouseDown;
|
| + mouse_event.button = blink::WebMouseEvent::ButtonLeft;
|
| mouse_event.x = 7;
|
| mouse_event.y = 7;
|
| mouse_event.clickCount = 1;
|
| tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
|
| - mouse_event.type = WebKit::WebInputEvent::MouseUp;
|
| + mouse_event.type = blink::WebInputEvent::MouseUp;
|
| tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
|
|
|
| ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
|
|
|