| 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 17 matching lines...) Expand all Loading... |
| 28 // Mac: http://crbug.com/103912 | 28 // Mac: http://crbug.com/103912 |
| 29 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState | 29 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState |
| 30 #else | 30 #else |
| 31 #define MAYBE_UpdateWindowShowState UpdateWindowShowState | 31 #define MAYBE_UpdateWindowShowState UpdateWindowShowState |
| 32 #endif // defined(USE_AURA) || defined(OS_MACOSX) | 32 #endif // defined(USE_AURA) || defined(OS_MACOSX) |
| 33 | 33 |
| 34 #define MAYBE_UpdateWindowResize UpdateWindowResize | 34 #define MAYBE_UpdateWindowResize UpdateWindowResize |
| 35 #endif // defined(OS_LINUX) && !defined(USE_AURA) | 35 #endif // defined(OS_LINUX) && !defined(USE_AURA) |
| 36 | 36 |
| 37 // http://crbug.com/145639 | 37 // http://crbug.com/145639 |
| 38 #if defined(OS_CHROMEOS) || defined(OS_WIN) | 38 #if defined(OS_LINUX) || defined(OS_WIN) |
| 39 #define MAYBE_TabEvents DISABLED_TabEvents | 39 #define MAYBE_TabEvents DISABLED_TabEvents |
| 40 #else | 40 #else |
| 41 #define MAYBE_TabEvents TabEvents | 41 #define MAYBE_TabEvents TabEvents |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 class ExtensionApiNewTabTest : public ExtensionApiTest { | 44 class ExtensionApiNewTabTest : public ExtensionApiTest { |
| 45 public: | 45 public: |
| 46 ExtensionApiNewTabTest() {} | 46 ExtensionApiNewTabTest() {} |
| 47 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 47 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 48 ExtensionApiTest::SetUpCommandLine(command_line); | 48 ExtensionApiTest::SetUpCommandLine(command_line); |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 << message_; | 254 << message_; |
| 255 } | 255 } |
| 256 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 256 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { |
| 257 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 257 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 258 << message_; | 258 << message_; |
| 259 } | 259 } |
| 260 | 260 |
| 261 // Adding a new test? Awesome. But API tests are the old hotness. The | 261 // Adding a new test? Awesome. But API tests are the old hotness. The |
| 262 // new hotness is extension_test_utils. See tabs_test.cc for an example. | 262 // new hotness is extension_test_utils. See tabs_test.cc for an example. |
| 263 // We are trying to phase out many uses of API tests as they tend to be flaky. | 263 // We are trying to phase out many uses of API tests as they tend to be flaky. |
| OLD | NEW |