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

Side by Side Diff: chrome/test/base/chrome_test_suite.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/chrome_test_suite.h" 5 #include "chrome/test/base/chrome_test_suite.h"
6 6
7 #if defined(OS_CHROMEOS) 7 #if defined(OS_CHROMEOS)
8 #include <stdio.h> 8 #include <stdio.h>
9 #include <unistd.h> 9 #include <unistd.h>
10 #endif 10 #endif
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/metrics/stats_table.h" 15 #include "base/metrics/stats_table.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/process_util.h" 17 #include "base/process_util.h"
18 #include "base/stringprintf.h" 18 #include "base/stringprintf.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/chrome_content_browser_client.h" 21 #include "chrome/browser/chrome_content_browser_client.h"
22 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 22 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
23 #include "chrome/common/chrome_constants.h" 23 #include "chrome/common/chrome_constants.h"
24 #include "chrome/common/chrome_content_client.h" 24 #include "chrome/common/chrome_content_client.h"
25 #include "chrome/common/chrome_paths.h" 25 #include "chrome/common/chrome_paths.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "chrome/test/base/testing_browser_process.h" 27 #include "chrome/test/base/testing_browser_process.h"
28 #include "content/public/test/test_launcher.h" 28 #include "content/public/test/test_launcher.h"
29 #include "net/base/mock_host_resolver.h"
30 #include "net/base/net_errors.h" 29 #include "net/base/net_errors.h"
31 #include "net/base/net_util.h" 30 #include "net/base/net_util.h"
31 #include "net/dns/mock_host_resolver.h"
32 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
33 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
34 #include "ui/base/resource/resource_handle.h" 34 #include "ui/base/resource/resource_handle.h"
35 35
36 #if defined(OS_ANDROID) 36 #if defined(OS_ANDROID)
37 #include "base/android/jni_android.h" 37 #include "base/android/jni_android.h"
38 #include "chrome/browser/android/chrome_jni_registrar.h" 38 #include "chrome/browser/android/chrome_jni_registrar.h"
39 #include "net/android/net_jni_registrar.h" 39 #include "net/android/net_jni_registrar.h"
40 #include "ui/android/ui_jni_registrar.h" 40 #include "ui/android/ui_jni_registrar.h"
41 #endif 41 #endif
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 #if defined(OS_MACOSX) && !defined(OS_IOS) 278 #if defined(OS_MACOSX) && !defined(OS_IOS)
279 base::mac::SetOverrideFrameworkBundle(NULL); 279 base::mac::SetOverrideFrameworkBundle(NULL);
280 #endif 280 #endif
281 281
282 base::StatsTable::set_current(NULL); 282 base::StatsTable::set_current(NULL);
283 stats_table_.reset(); 283 stats_table_.reset();
284 RemoveSharedMemoryFile(stats_filename_); 284 RemoveSharedMemoryFile(stats_filename_);
285 285
286 base::TestSuite::Shutdown(); 286 base::TestSuite::Shutdown();
287 } 287 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698