| 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" |
| 11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
| 12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 14 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
| 15 #include "net/dns/mock_host_resolver.h" | 15 #include "net/dns/mock_host_resolver.h" |
| 16 | 16 |
| 17 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
| 18 #include "ui/aura/root_window.h" | |
| 19 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
| 19 #include "ui/aura/window_event_dispatcher.h" |
| 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/gtk. http://crbug.com/72369 | 23 // so these tests fail on linux/gtk. http://crbug.com/72369 |
| 24 #if defined(OS_LINUX) && !defined(USE_AURA) | 24 #if defined(OS_LINUX) && !defined(USE_AURA) |
| 25 #define MAYBE_UpdateWindowResize DISABLED_UpdateWindowResize | 25 #define MAYBE_UpdateWindowResize DISABLED_UpdateWindowResize |
| 26 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState | 26 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState |
| 27 #else | 27 #else |
| 28 | 28 |
| 29 #if defined(USE_AURA) || defined(OS_MACOSX) | 29 #if defined(USE_AURA) || defined(OS_MACOSX) |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 << message_; | 252 << message_; |
| 253 } | 253 } |
| 254 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 254 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { |
| 255 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 255 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 256 << message_; | 256 << message_; |
| 257 } | 257 } |
| 258 | 258 |
| 259 // Adding a new test? Awesome. But API tests are the old hotness. The | 259 // Adding a new test? Awesome. But API tests are the old hotness. The |
| 260 // new hotness is extension_test_utils. See tabs_test.cc for an example. | 260 // new hotness is extension_test_utils. See tabs_test.cc for an example. |
| 261 // We are trying to phase out many uses of API tests as they tend to be flaky. | 261 // We are trying to phase out many uses of API tests as they tend to be flaky. |
| OLD | NEW |