Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Side by Side Diff: chrome/browser/extensions/extension_tabs_apitest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/base/mock_host_resolver.h" 15 #include "net/dns/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)
19 #define MAYBE_TabOnRemoved DISABLED_TabOnRemoved 19 #define MAYBE_TabOnRemoved DISABLED_TabOnRemoved
20 #else 20 #else
21 #define MAYBE_TabOnRemoved TabOnRemoved 21 #define MAYBE_TabOnRemoved TabOnRemoved
22 #endif 22 #endif
23 23
24 // Window resizes are not completed by the time the callback happens, 24 // Window resizes are not completed by the time the callback happens,
25 // so these tests fail on linux/gtk. http://crbug.com/72369 25 // so these tests fail on linux/gtk. http://crbug.com/72369
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 << message_; 245 << message_;
246 } 246 }
247 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { 247 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) {
248 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) 248 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html"))
249 << message_; 249 << message_;
250 } 250 }
251 251
252 // Adding a new test? Awesome. But API tests are the old hotness. The 252 // Adding a new test? Awesome. But API tests are the old hotness. The
253 // new hotness is extension_test_utils. See tabs_test.cc for an example. 253 // new hotness is extension_test_utils. See tabs_test.cc for an example.
254 // We are trying to phase out many uses of API tests as they tend to be flaky. 254 // We are trying to phase out many uses of API tests as they tend to be flaky.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698