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 "chrome/browser/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
6 #include "chrome/browser/extensions/extension_test_message_listener.h" | 6 #include "chrome/browser/extensions/extension_test_message_listener.h" |
7 | 7 |
8 // Helper class for tests related to the Apps Window API (chrome.app.window). | 8 // Helper class for tests related to the Apps Window API (chrome.app.window). |
9 class AppWindowAPI : public extensions::PlatformAppBrowserTest { | 9 class AppWindowAPI : public extensions::PlatformAppBrowserTest { |
10 public: | 10 public: |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 if (!catcher.GetNextResult()) { | 22 if (!catcher.GetNextResult()) { |
23 message_ = catcher.message(); | 23 message_ = catcher.message(); |
24 return false; | 24 return false; |
25 } | 25 } |
26 | 26 |
27 return true; | 27 return true; |
28 } | 28 } |
29 }; | 29 }; |
30 | 30 |
31 IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestCreate) { | 31 // These tests are flaky after https://codereview.chromium.org/57433010/. |
| 32 // See http://crbug.com/319613. |
| 33 |
| 34 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestCreate) { |
32 ASSERT_TRUE(RunAppWindowAPITest("testCreate")) << message_; | 35 ASSERT_TRUE(RunAppWindowAPITest("testCreate")) << message_; |
33 } | 36 } |
34 | 37 |
35 IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestSingleton) { | 38 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestSingleton) { |
36 ASSERT_TRUE(RunAppWindowAPITest("testSingleton")) << message_; | 39 ASSERT_TRUE(RunAppWindowAPITest("testSingleton")) << message_; |
37 } | 40 } |
38 | 41 |
39 IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestBounds) { | 42 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestBounds) { |
40 ASSERT_TRUE(RunAppWindowAPITest("testBounds")) << message_; | 43 ASSERT_TRUE(RunAppWindowAPITest("testBounds")) << message_; |
41 } | 44 } |
42 | 45 |
43 IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestCloseEvent) { | 46 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestCloseEvent) { |
44 ASSERT_TRUE(RunAppWindowAPITest("testCloseEvent")) << message_; | 47 ASSERT_TRUE(RunAppWindowAPITest("testCloseEvent")) << message_; |
45 } | 48 } |
46 | 49 |
47 IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestMaximize) { | 50 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestMaximize) { |
48 ASSERT_TRUE(RunAppWindowAPITest("testMaximize")) << message_; | 51 ASSERT_TRUE(RunAppWindowAPITest("testMaximize")) << message_; |
49 } | 52 } |
50 | 53 |
51 IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestRestore) { | 54 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestRestore) { |
52 ASSERT_TRUE(RunAppWindowAPITest("testRestore")) << message_; | 55 ASSERT_TRUE(RunAppWindowAPITest("testRestore")) << message_; |
53 } | 56 } |
54 | 57 |
55 IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestRestoreAfterClose) { | 58 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestRestoreAfterClose) { |
56 ASSERT_TRUE(RunAppWindowAPITest("testRestoreAfterClose")) << message_; | 59 ASSERT_TRUE(RunAppWindowAPITest("testRestoreAfterClose")) << message_; |
57 } | 60 } |
58 | 61 |
59 IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestSizeConstraints) { | 62 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestSizeConstraints) { |
60 ASSERT_TRUE(RunAppWindowAPITest("testSizeConstraints")) << message_; | 63 ASSERT_TRUE(RunAppWindowAPITest("testSizeConstraints")) << message_; |
61 } | 64 } |
OLD | NEW |