| 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 "chrome/browser/prefs/incognito_mode_prefs.h" | 8 #include "chrome/browser/prefs/incognito_mode_prefs.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/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/base/mock_host_resolver.h" | 15 #include "net/base/mock_host_resolver.h" | 
| 16 | 16 | 
| 17 // Possible race in ChromeURLDataManager. http://crbug.com/59198 | 17 // Possible race in ChromeURLDataManager. http://crbug.com/59198 | 
| 18 #if defined(OS_MACOSX) || defined(OS_LINUX) | 18 #if defined(OS_MACOSX) || defined(OS_LINUX) | 
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 244       << message_; | 244       << message_; | 
| 245 } | 245 } | 
| 246 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 246 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 
| 247   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 247   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 
| 248       << message_; | 248       << message_; | 
| 249 } | 249 } | 
| 250 | 250 | 
| 251 // Adding a new test? Awesome. But API tests are the old hotness. The | 251 // 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. | 252 // 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. | 253 // We are trying to phase out many uses of API tests as they tend to be flaky. | 
| OLD | NEW | 
|---|