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/app_window_geometry_cache.h" | 5 #include "apps/app_window_geometry_cache.h" |
| 6 #include "chrome/browser/apps/app_browsertest_util.h" | 6 #include "chrome/browser/apps/app_browsertest_util.h" |
| 7 #include "chrome/browser/extensions/extension_test_message_listener.h" | 7 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/extensions/application_launch.h" | 10 #include "chrome/browser/ui/extensions/application_launch.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 123 } | 123 } |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 // These tests are flaky after https://codereview.chromium.org/57433010/. | 126 // These tests are flaky after https://codereview.chromium.org/57433010/. |
| 127 // See http://crbug.com/319613. | 127 // See http://crbug.com/319613. |
| 128 | 128 |
| 129 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestCreate) { | 129 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestCreate) { |
| 130 ASSERT_TRUE(RunAppWindowAPITest("testCreate")) << message_; | 130 ASSERT_TRUE(RunAppWindowAPITest("testCreate")) << message_; |
| 131 } | 131 } |
| 132 | 132 |
| 133 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestInitialBounds) { | |
|
benwells
2014/03/05 02:33:30
It would be good to also have a test for the depre
| |
| 134 ASSERT_TRUE(RunAppWindowAPITest("testInitialBounds")) << message_; | |
| 135 } | |
| 136 | |
| 137 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestInitialBoundsInStable) { | |
| 138 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); | |
| 139 ASSERT_TRUE(RunAppWindowAPITest("testInitialBoundsInStable")) << message_; | |
| 140 } | |
| 141 | |
| 142 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestInitialConstraints) { | |
| 143 ASSERT_TRUE(RunAppWindowAPITest("testInitialConstraints")) << message_; | |
| 144 } | |
| 145 | |
| 133 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestSingleton) { | 146 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestSingleton) { |
| 134 ASSERT_TRUE(RunAppWindowAPITest("testSingleton")) << message_; | 147 ASSERT_TRUE(RunAppWindowAPITest("testSingleton")) << message_; |
| 135 } | 148 } |
| 136 | 149 |
| 137 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestBounds) { | 150 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestBounds) { |
| 138 ASSERT_TRUE(RunAppWindowAPITest("testBounds")) << message_; | 151 ASSERT_TRUE(RunAppWindowAPITest("testBounds")) << message_; |
| 139 } | 152 } |
| 140 | 153 |
| 141 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestCloseEvent) { | 154 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestCloseEvent) { |
| 142 ASSERT_TRUE(RunAppWindowAPITest("testCloseEvent")) << message_; | 155 ASSERT_TRUE(RunAppWindowAPITest("testCloseEvent")) << message_; |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 #if defined(USE_AURA) | 233 #if defined(USE_AURA) |
| 221 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { | 234 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { |
| 222 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; | 235 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; |
| 223 } | 236 } |
| 224 | 237 |
| 225 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) { | 238 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) { |
| 226 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); | 239 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); |
| 227 ASSERT_TRUE(RunAppWindowAPITest("testFrameColorsInStable")) << message_; | 240 ASSERT_TRUE(RunAppWindowAPITest("testFrameColorsInStable")) << message_; |
| 228 } | 241 } |
| 229 #endif | 242 #endif |
| OLD | NEW |