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

Side by Side Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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_frame/test/net/fake_external_tab.h" 5 #include "chrome_frame/test/net/fake_external_tab.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <exdisp.h> 9 #include <exdisp.h>
10 #include <Winsock2.h> 10 #include <Winsock2.h>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/debug/debugger.h" 14 #include "base/debug/debugger.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/file_version_info.h" 16 #include "base/file_version_info.h"
17 #include "base/files/scoped_temp_dir.h" 17 #include "base/files/scoped_temp_dir.h"
18 #include "base/i18n/icu_util.h" 18 #include "base/i18n/icu_util.h"
19 #include "base/lazy_instance.h" 19 #include "base/lazy_instance.h"
20 #include "base/memory/scoped_ptr.h" 20 #include "base/memory/scoped_ptr.h"
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/prefs/json_pref_store.h" 22 #include "base/prefs/json_pref_store.h"
23 #include "base/prefs/pref_registry_simple.h"
24 #include "base/prefs/pref_service.h"
23 #include "base/string_piece.h" 25 #include "base/string_piece.h"
24 #include "base/string_util.h" 26 #include "base/string_util.h"
25 #include "base/stringprintf.h" 27 #include "base/stringprintf.h"
26 #include "base/system_monitor/system_monitor.h" 28 #include "base/system_monitor/system_monitor.h"
27 #include "base/test/test_timeouts.h" 29 #include "base/test/test_timeouts.h"
28 #include "base/threading/platform_thread.h" 30 #include "base/threading/platform_thread.h"
29 #include "base/threading/thread.h" 31 #include "base/threading/thread.h"
30 #include "base/win/scoped_comptr.h" 32 #include "base/win/scoped_comptr.h"
31 #include "base/win/scoped_handle.h" 33 #include "base/win/scoped_handle.h"
32 #include "chrome/app/chrome_main_delegate.h" 34 #include "chrome/app/chrome_main_delegate.h"
33 #include "chrome/browser/automation/automation_provider_list.h" 35 #include "chrome/browser/automation/automation_provider_list.h"
34 #include "chrome/browser/chrome_content_browser_client.h" 36 #include "chrome/browser/chrome_content_browser_client.h"
35 #include "chrome/browser/prefs/browser_prefs.h" 37 #include "chrome/browser/prefs/browser_prefs.h"
36 #include "chrome/browser/prefs/pref_registry_simple.h"
37 #include "chrome/browser/prefs/pref_service.h"
38 #include "chrome/browser/prefs/proxy_config_dictionary.h" 38 #include "chrome/browser/prefs/proxy_config_dictionary.h"
39 #include "chrome/browser/process_singleton.h" 39 #include "chrome/browser/process_singleton.h"
40 #include "chrome/browser/profiles/profile_manager.h" 40 #include "chrome/browser/profiles/profile_manager.h"
41 #include "chrome/browser/renderer_host/web_cache_manager.h" 41 #include "chrome/browser/renderer_host/web_cache_manager.h"
42 #include "chrome/common/chrome_constants.h" 42 #include "chrome/common/chrome_constants.h"
43 #include "chrome/common/chrome_content_client.h" 43 #include "chrome/common/chrome_content_client.h"
44 #include "chrome/common/chrome_paths.h" 44 #include "chrome/common/chrome_paths.h"
45 #include "chrome/common/chrome_paths_internal.h" 45 #include "chrome/common/chrome_paths_internal.h"
46 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
47 #include "chrome/common/pref_names.h" 47 #include "chrome/common/pref_names.h"
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 // content::InitializeSandboxInfo(&sandbox_info); 965 // content::InitializeSandboxInfo(&sandbox_info);
966 FakeMainDelegate delegate; 966 FakeMainDelegate delegate;
967 content::ContentMain( 967 content::ContentMain(
968 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), 968 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
969 &sandbox_info, 969 &sandbox_info,
970 &delegate); 970 &delegate);
971 971
972 // Note: In debug builds, we ExitProcess during PostDestroyThreads. 972 // Note: In debug builds, we ExitProcess during PostDestroyThreads.
973 return g_test_suite->test_result(); 973 return g_test_suite->test_result();
974 } 974 }
OLDNEW
« no previous file with comments | « chrome/test/reliability/page_load_test.cc ('k') | chrome_frame/test/reliability/page_load_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698