Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

Side by Side Diff: chrome/browser/apps/guest_view/web_view_browsertest.cc

Issue 2003423002: Disable WebViewTest.Shim_TestDeclarativeWebRequestAPISendMessage on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <queue> 5 #include <queue>
6 #include <set> 6 #include <set>
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1354 "web_view/shim", 1354 "web_view/shim",
1355 NO_TEST_SERVER); 1355 NO_TEST_SERVER);
1356 } 1356 }
1357 1357
1358 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestDeclarativeWebRequestAPI) { 1358 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestDeclarativeWebRequestAPI) {
1359 TestHelper("testDeclarativeWebRequestAPI", 1359 TestHelper("testDeclarativeWebRequestAPI",
1360 "web_view/shim", 1360 "web_view/shim",
1361 NEEDS_TEST_SERVER); 1361 NEEDS_TEST_SERVER);
1362 } 1362 }
1363 1363
1364 // Very flaky on Mac: http://crbug.com/614377
1365 #ifdef OS_MAC
1366 #define MAYBE_Shim_TestDeclarativeWebRequestAPISendMessage DISABLED_Shim_TestDec larativeWebRequestAPISendMessage
1367 #else
1368 #define MAYBE_Shim_TestDeclarativeWebRequestAPISendMessage Shim_TestDeclarativeW ebRequestAPISendMessage
1369 #endif
1364 IN_PROC_BROWSER_TEST_P(WebViewTest, 1370 IN_PROC_BROWSER_TEST_P(WebViewTest,
1365 Shim_TestDeclarativeWebRequestAPISendMessage) { 1371 Shim_TestDeclarativeWebRequestAPISendMessage) {
1366 TestHelper("testDeclarativeWebRequestAPISendMessage", 1372 TestHelper("testDeclarativeWebRequestAPISendMessage",
1367 "web_view/shim", 1373 "web_view/shim",
1368 NEEDS_TEST_SERVER); 1374 NEEDS_TEST_SERVER);
1369 } 1375 }
1370 1376
1371 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestWebRequestAPI) { 1377 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestWebRequestAPI) {
1372 TestHelper("testWebRequestAPI", "web_view/shim", NEEDS_TEST_SERVER); 1378 TestHelper("testWebRequestAPI", "web_view/shim", NEEDS_TEST_SERVER);
1373 } 1379 }
(...skipping 2056 matching lines...) Expand 10 before | Expand all | Expand 10 after
3430 gfx::Point embedder_origin = 3436 gfx::Point embedder_origin =
3431 GetEmbedderWebContents()->GetContainerBounds().origin(); 3437 GetEmbedderWebContents()->GetContainerBounds().origin();
3432 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); 3438 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y());
3433 3439
3434 // Generate and send synthetic touch event. 3440 // Generate and send synthetic touch event.
3435 content::SimulateTouchPressAt(GetEmbedderWebContents(), 3441 content::SimulateTouchPressAt(GetEmbedderWebContents(),
3436 guest_rect.CenterPoint()); 3442 guest_rect.CenterPoint());
3437 EXPECT_TRUE(aura_webview->HasFocus()); 3443 EXPECT_TRUE(aura_webview->HasFocus());
3438 } 3444 }
3439 #endif 3445 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698