Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "apps/native_app_window.h" | 5 #include "apps/native_app_window.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
| 9 #include "chrome/browser/automation/automation_util.h" | 9 #include "chrome/browser/automation/automation_util.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 #include "content/public/browser/web_contents_delegate.h" | 22 #include "content/public/browser/web_contents_delegate.h" |
| 23 #include "content/public/test/browser_test_utils.h" | 23 #include "content/public/test/browser_test_utils.h" |
| 24 #include "content/public/test/fake_speech_recognition_manager.h" | 24 #include "content/public/test/fake_speech_recognition_manager.h" |
| 25 #include "net/test/embedded_test_server/embedded_test_server.h" | 25 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 26 #include "net/test/embedded_test_server/http_request.h" | 26 #include "net/test/embedded_test_server/http_request.h" |
| 27 #include "net/test/embedded_test_server/http_response.h" | 27 #include "net/test/embedded_test_server/http_response.h" |
| 28 #include "ui/gl/gl_switches.h" | 28 #include "ui/gl/gl_switches.h" |
| 29 | 29 |
| 30 // For fine-grained suppression on flaky tests. | 30 // For fine-grained suppression on flaky tests. |
| 31 #if defined(OS_WIN) | 31 #if defined(OS_WIN) |
| 32 #include "base/win/windows_version.h" | 32 #include "base/win/windows_version.h" |
|
lazyboy
2013/08/30 23:21:49
Here.
| |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 using prerender::PrerenderLinkManager; | 35 using prerender::PrerenderLinkManager; |
| 36 using prerender::PrerenderLinkManagerFactory; | 36 using prerender::PrerenderLinkManagerFactory; |
| 37 | 37 |
| 38 namespace { | 38 namespace { |
| 39 const char kEmptyResponsePath[] = "/close-socket"; | 39 const char kEmptyResponsePath[] = "/close-socket"; |
| 40 const char kRedirectResponsePath[] = "/server-redirect"; | 40 const char kRedirectResponsePath[] = "/server-redirect"; |
| 41 const char kRedirectResponseFullPath[] = | 41 const char kRedirectResponseFullPath[] = |
| 42 "/extensions/platform_apps/web_view/shim/guest_redirect.html"; | 42 "/extensions/platform_apps/web_view/shim/guest_redirect.html"; |
| (...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1533 } | 1533 } |
| 1534 | 1534 |
| 1535 IN_PROC_BROWSER_TEST_F(WebViewTest, GeolocationRequestGone) { | 1535 IN_PROC_BROWSER_TEST_F(WebViewTest, GeolocationRequestGone) { |
| 1536 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 1536 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
| 1537 ASSERT_TRUE(RunPlatformAppTest( | 1537 ASSERT_TRUE(RunPlatformAppTest( |
| 1538 "platform_apps/web_view/geolocation/geolocation_request_gone")) | 1538 "platform_apps/web_view/geolocation/geolocation_request_gone")) |
| 1539 << message_; | 1539 << message_; |
| 1540 } | 1540 } |
| 1541 | 1541 |
| 1542 IN_PROC_BROWSER_TEST_F(WebViewTest, ClearData) { | 1542 IN_PROC_BROWSER_TEST_F(WebViewTest, ClearData) { |
| 1543 #if defined(OS_WIN) | |
| 1544 // Flaky on XP bot http://crbug.com/282674 | |
| 1545 if (base::win::GetVersion() <= base::win::VERSION_XP) | |
|
Lambros
2013/08/30 23:07:35
nit: #include "base/win/windows_version.h" for Get
lazyboy
2013/08/30 23:15:31
Seems like it is already included.
Lambros
2013/08/30 23:19:56
I don't see it in this file in this CL. Transitive
lazyboy
2013/08/30 23:21:49
^^^
| |
| 1546 return; | |
| 1547 #endif | |
| 1548 | |
| 1543 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 1549 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
| 1544 ASSERT_TRUE(RunPlatformAppTestWithArg( | 1550 ASSERT_TRUE(RunPlatformAppTestWithArg( |
| 1545 "platform_apps/web_view/common", "cleardata")) | 1551 "platform_apps/web_view/common", "cleardata")) |
| 1546 << message_; | 1552 << message_; |
| 1547 } | 1553 } |
| 1548 | 1554 |
| 1549 IN_PROC_BROWSER_TEST_F(WebViewTest, ConsoleMessage) { | 1555 IN_PROC_BROWSER_TEST_F(WebViewTest, ConsoleMessage) { |
| 1550 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 1556 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
| 1551 ASSERT_TRUE(RunPlatformAppTestWithArg( | 1557 ASSERT_TRUE(RunPlatformAppTestWithArg( |
| 1552 "platform_apps/web_view/common", "console_messages")) | 1558 "platform_apps/web_view/common", "console_messages")) |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1652 "DoneDialogTest.FAILED", | 1658 "DoneDialogTest.FAILED", |
| 1653 "web_view/dialog"); | 1659 "web_view/dialog"); |
| 1654 } | 1660 } |
| 1655 | 1661 |
| 1656 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) { | 1662 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) { |
| 1657 TestHelper("testPromptDialog", | 1663 TestHelper("testPromptDialog", |
| 1658 "DoneDialogTest.PASSED", | 1664 "DoneDialogTest.PASSED", |
| 1659 "DoneDialogTest.FAILED", | 1665 "DoneDialogTest.FAILED", |
| 1660 "web_view/dialog"); | 1666 "web_view/dialog"); |
| 1661 } | 1667 } |
| OLD | NEW |