| 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 "chrome/browser/prefs/incognito_mode_prefs.h" | 7 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 
| 8 #include "chrome/browser/prefs/pref_service.h" | 8 #include "chrome/browser/prefs/pref_service.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" | 
| 11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" | 
| 12 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" | 
| 13 #include "net/base/mock_host_resolver.h" | 13 #include "net/base/mock_host_resolver.h" | 
| 14 | 14 | 
| 15 // Possible race in ChromeURLDataManager. http://crbug.com/59198 | 15 // Possible race in ChromeURLDataManager. http://crbug.com/59198 | 
| 16 #if defined(OS_MACOSX) || defined(OS_LINUX) | 16 #if defined(OS_MACOSX) || defined(OS_LINUX) | 
| 17 #define MAYBE_TabOnRemoved DISABLED_TabOnRemoved | 17 #define MAYBE_TabOnRemoved DISABLED_TabOnRemoved | 
| 18 #else | 18 #else | 
| 19 #define MAYBE_TabOnRemoved TabOnRemoved | 19 #define MAYBE_TabOnRemoved TabOnRemoved | 
| 20 #endif | 20 #endif | 
| 21 | 21 | 
| 22 // Window resizes are not completed by the time the callback happens, | 22 // Window resizes are not completed by the time the callback happens, | 
| 23 // so these tests fail on linux. http://crbug.com/72369 | 23 // so these tests fail on linux/gtk. http://crbug.com/72369 | 
| 24 #if defined(OS_LINUX) | 24 #if defined(OS_LINUX) && !defined(USE_AURA) | 
| 25 #define MAYBE_FocusWindowDoesNotExitFullscreen \ | 25 #define MAYBE_FocusWindowDoesNotExitFullscreen \ | 
| 26   DISABLED_FocusWindowDoesNotExitFullscreen | 26   DISABLED_FocusWindowDoesNotExitFullscreen | 
| 27 #define MAYBE_UpdateWindowSizeExitsFullscreen \ | 27 #define MAYBE_UpdateWindowSizeExitsFullscreen \ | 
| 28   DISABLED_UpdateWindowSizeExitsFullscreen | 28   DISABLED_UpdateWindowSizeExitsFullscreen | 
| 29 #define MAYBE_UpdateWindowResize DISABLED_UpdateWindowResize | 29 #define MAYBE_UpdateWindowResize DISABLED_UpdateWindowResize | 
| 30 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState | 30 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState | 
| 31 #else | 31 #else | 
| 32 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen | 32 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen | 
| 33 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen | 33 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen | 
| 34 #define MAYBE_UpdateWindowResize UpdateWindowResize | 34 #define MAYBE_UpdateWindowResize UpdateWindowResize | 
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 210 } | 210 } | 
| 211 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { | 211 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { | 
| 212   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 212   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 
| 213       << message_; | 213       << message_; | 
| 214 } | 214 } | 
| 215 | 215 | 
| 216 // Adding a new test? Awesome. But API tests are the old hotness. The | 216 // Adding a new test? Awesome. But API tests are the old hotness. The | 
| 217 // new hotness is extension_test_utils. See extension_tabs_test.cc for | 217 // new hotness is extension_test_utils. See extension_tabs_test.cc for | 
| 218 // an example. We are trying to phase out many uses of API tests as | 218 // an example. We are trying to phase out many uses of API tests as | 
| 219 // they tend to be flaky. | 219 // they tend to be flaky. | 
| OLD | NEW | 
|---|