| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 8 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 } | 99 } |
| 100 | 100 |
| 101 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabUpdate) { | 101 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabUpdate) { |
| 102 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "update.html")) << message_; | 102 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "update.html")) << message_; |
| 103 } | 103 } |
| 104 | 104 |
| 105 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabPinned) { | 105 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabPinned) { |
| 106 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_; | 106 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_; |
| 107 } | 107 } |
| 108 | 108 |
| 109 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabMove) { | 109 // Flaky on windows: http://crbug.com/238667 |
| 110 #if defined(OS_WIN) |
| 111 #define MAYBE_TabMove DISABLED_TabMove |
| 112 #else |
| 113 #define MAYBE_TabMove TabMove |
| 114 #endif |
| 115 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabMove) { |
| 110 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "move.html")) << message_; | 116 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "move.html")) << message_; |
| 111 } | 117 } |
| 112 | 118 |
| 113 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabEvents) { | 119 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabEvents) { |
| 114 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_; | 120 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_; |
| 115 } | 121 } |
| 116 | 122 |
| 117 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabRelativeURLs) { | 123 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabRelativeURLs) { |
| 118 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "relative_urls.html")) | 124 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "relative_urls.html")) |
| 119 << message_; | 125 << message_; |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 << message_; | 263 << message_; |
| 258 } | 264 } |
| 259 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 265 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { |
| 260 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 266 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 261 << message_; | 267 << message_; |
| 262 } | 268 } |
| 263 | 269 |
| 264 // Adding a new test? Awesome. But API tests are the old hotness. The | 270 // Adding a new test? Awesome. But API tests are the old hotness. The |
| 265 // new hotness is extension_test_utils. See tabs_test.cc for an example. | 271 // new hotness is extension_test_utils. See tabs_test.cc for an example. |
| 266 // We are trying to phase out many uses of API tests as they tend to be flaky. | 272 // We are trying to phase out many uses of API tests as they tend to be flaky. |
| OLD | NEW |