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

Side by Side Diff: chrome/test/base/in_process_browser_test.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/test/base/in_process_browser_test.h" 5 #include "chrome/test/base/in_process_browser_test.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 26 matching lines...) Expand all
37 #include "chrome/test/base/chrome_test_suite.h" 37 #include "chrome/test/base/chrome_test_suite.h"
38 #include "chrome/test/base/test_launcher_utils.h" 38 #include "chrome/test/base/test_launcher_utils.h"
39 #include "chrome/test/base/testing_browser_process.h" 39 #include "chrome/test/base/testing_browser_process.h"
40 #include "chrome/test/base/ui_test_utils.h" 40 #include "chrome/test/base/ui_test_utils.h"
41 #include "content/public/browser/notification_service.h" 41 #include "content/public/browser/notification_service.h"
42 #include "content/public/browser/notification_types.h" 42 #include "content/public/browser/notification_types.h"
43 #include "content/public/test/browser_test_utils.h" 43 #include "content/public/test/browser_test_utils.h"
44 #include "content/public/test/test_browser_thread.h" 44 #include "content/public/test/test_browser_thread.h"
45 #include "content/public/test/test_launcher.h" 45 #include "content/public/test/test_launcher.h"
46 #include "content/public/test/test_navigation_observer.h" 46 #include "content/public/test/test_navigation_observer.h"
47 #include "net/base/mock_host_resolver.h" 47 #include "net/dns/mock_host_resolver.h"
48 #include "net/test/test_server.h" 48 #include "net/test/test_server.h"
49 #include "ui/compositor/compositor_switches.h" 49 #include "ui/compositor/compositor_switches.h"
50 50
51 #if defined(OS_CHROMEOS) 51 #if defined(OS_CHROMEOS)
52 #include "chrome/browser/chromeos/audio/audio_handler.h" 52 #include "chrome/browser/chromeos/audio/audio_handler.h"
53 #elif defined(OS_MACOSX) 53 #elif defined(OS_MACOSX)
54 #include "base/mac/scoped_nsautorelease_pool.h" 54 #include "base/mac/scoped_nsautorelease_pool.h"
55 #endif 55 #endif
56 56
57 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 57 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 // On the Mac, this eventually reaches 393 // On the Mac, this eventually reaches
394 // -[BrowserWindowController windowWillClose:], which will post a deferred 394 // -[BrowserWindowController windowWillClose:], which will post a deferred
395 // -autorelease on itself to ultimately destroy the Browser object. The line 395 // -autorelease on itself to ultimately destroy the Browser object. The line
396 // below is necessary to pump these pending messages to ensure all Browsers 396 // below is necessary to pump these pending messages to ensure all Browsers
397 // get deleted. 397 // get deleted.
398 content::RunAllPendingInMessageLoop(); 398 content::RunAllPendingInMessageLoop();
399 delete autorelease_pool_; 399 delete autorelease_pool_;
400 autorelease_pool_ = NULL; 400 autorelease_pool_ = NULL;
401 #endif 401 #endif
402 } 402 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698