| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 // crbug.com/149924 | 70 // crbug.com/149924 |
| 71 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabDuplicate) { | 71 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabDuplicate) { |
| 72 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "duplicate.html")) << message_; | 72 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "duplicate.html")) << message_; |
| 73 } | 73 } |
| 74 | 74 |
| 75 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabSize) { | 75 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabSize) { |
| 76 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "tab_size.html")) << message_; | 76 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "tab_size.html")) << message_; |
| 77 } | 77 } |
| 78 | 78 |
| 79 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabUpdate) { | 79 // Flaky on linux: http://crbug.com/396364 |
| 80 #if defined(OS_LINUX) |
| 81 #define MAYBE_TabUpdate DISABLED_TabUpdate |
| 82 #else |
| 83 #define MAYBE_TabUpdate TabUpdate |
| 84 #endif |
| 85 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabUpdate) { |
| 80 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "update.html")) << message_; | 86 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "update.html")) << message_; |
| 81 } | 87 } |
| 82 | 88 |
| 83 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabPinned) { | 89 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabPinned) { |
| 84 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_; | 90 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_; |
| 85 } | 91 } |
| 86 | 92 |
| 87 // Flaky on windows: http://crbug.com/238667 | 93 // Flaky on windows: http://crbug.com/238667 |
| 88 #if defined(OS_WIN) | 94 #if defined(OS_WIN) |
| 89 #define MAYBE_TabMove DISABLED_TabMove | 95 #define MAYBE_TabMove DISABLED_TabMove |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 << message_; | 250 << message_; |
| 245 } | 251 } |
| 246 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 252 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { |
| 247 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 253 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 248 << message_; | 254 << message_; |
| 249 } | 255 } |
| 250 | 256 |
| 251 // Adding a new test? Awesome. But API tests are the old hotness. The | 257 // Adding a new test? Awesome. But API tests are the old hotness. The |
| 252 // new hotness is extension_test_utils. See tabs_test.cc for an example. | 258 // new hotness is extension_test_utils. See tabs_test.cc for an example. |
| 253 // We are trying to phase out many uses of API tests as they tend to be flaky. | 259 // We are trying to phase out many uses of API tests as they tend to be flaky. |
| OLD | NEW |