| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 DISABLED_FocusWindowDoesNotExitFullscreen | 48 DISABLED_FocusWindowDoesNotExitFullscreen |
| 49 #else | 49 #else |
| 50 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen | 50 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen |
| 51 #endif | 51 #endif |
| 52 | 52 |
| 53 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen | 53 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen |
| 54 #define MAYBE_UpdateWindowResize UpdateWindowResize | 54 #define MAYBE_UpdateWindowResize UpdateWindowResize |
| 55 #endif // defined(OS_LINUX) && !defined(USE_AURA) | 55 #endif // defined(OS_LINUX) && !defined(USE_AURA) |
| 56 | 56 |
| 57 // http://crbug.com/145639 | 57 // http://crbug.com/145639 |
| 58 #if defined(OS_CHROMEOS) | 58 #if defined(OS_CHROMEOS) || defined(OS_WIN) |
| 59 #define MAYBE_TabEvents DISABLED_TabEvents | 59 #define MAYBE_TabEvents DISABLED_TabEvents |
| 60 #else | 60 #else |
| 61 #define MAYBE_TabEvents TabEvents | 61 #define MAYBE_TabEvents TabEvents |
| 62 #endif // defined(OS_CHROMEOS) | 62 #endif |
| 63 | 63 |
| 64 class ExtensionApiNewTabTest : public ExtensionApiTest { | 64 class ExtensionApiNewTabTest : public ExtensionApiTest { |
| 65 public: | 65 public: |
| 66 ExtensionApiNewTabTest() {} | 66 ExtensionApiNewTabTest() {} |
| 67 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 67 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 68 ExtensionApiTest::SetUpCommandLine(command_line); | 68 ExtensionApiTest::SetUpCommandLine(command_line); |
| 69 // Override the default which InProcessBrowserTest adds if it doesn't see a | 69 // Override the default which InProcessBrowserTest adds if it doesn't see a |
| 70 // homepage. | 70 // homepage. |
| 71 command_line->AppendSwitchASCII( | 71 command_line->AppendSwitchASCII( |
| 72 switches::kHomePage, chrome::kChromeUINewTabURL); | 72 switches::kHomePage, chrome::kChromeUINewTabURL); |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 << message_; | 257 << message_; |
| 258 } | 258 } |
| 259 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 259 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { |
| 260 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 260 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 261 << message_; | 261 << message_; |
| 262 } | 262 } |
| 263 | 263 |
| 264 // Adding a new test? Awesome. But API tests are the old hotness. The | 264 // 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. | 265 // 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. | 266 // We are trying to phase out many uses of API tests as they tend to be flaky. |
| OLD | NEW |