diff options
37 files changed, 58 insertions, 122 deletions
diff --git a/base/base.gyp b/base/base.gyp index 4aa3de7..ff2c21f 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -159,6 +159,7 @@ 'file_util_unittest.cc', 'file_version_info_unittest.cc', 'gmock_unittest.cc', + 'hi_res_timer_manager_unittest.cc', 'id_map_unittest.cc', 'i18n/break_iterator_unittest.cc', 'i18n/char_iterator_unittest.cc', diff --git a/base/base.gypi b/base/base.gypi index 14075be..4e72b49 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -140,6 +140,9 @@ 'global_descriptors_posix.h', 'gtest_prod_util.h', 'hash_tables.h', + 'hi_res_timer_manager_posix.cc', + 'hi_res_timer_manager_win.cc', + 'hi_res_timer_manager.h', 'id_map.h', 'json/json_file_value_serializer.cc', 'json/json_file_value_serializer.h', @@ -253,6 +256,8 @@ 'platform_file_posix.cc', 'platform_file_win.cc', 'port.h', + 'posix/unix_domain_socket.cc', + 'posix/unix_domain_socket.h', 'process.h', 'process_linux.cc', 'process_posix.cc', diff --git a/content/common/hi_res_timer_manager.h b/base/hi_res_timer_manager.h index 210789f..690e89e 100644 --- a/content/common/hi_res_timer_manager.h +++ b/base/hi_res_timer_manager.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_HI_RES_TIMER_MANAGER_H_ -#define CONTENT_COMMON_HI_RES_TIMER_MANAGER_H_ +#ifndef BASE_HI_RES_TIMER_MANAGER_H_ +#define BASE_HI_RES_TIMER_MANAGER_H_ #pragma once +#include "base/base_export.h" #include "base/system_monitor/system_monitor.h" -#include "content/common/content_export.h" // Ensures that the Windows high resolution timer is only used // when not running on battery power. -class CONTENT_EXPORT HighResolutionTimerManager +class BASE_EXPORT HighResolutionTimerManager : public base::SystemMonitor::PowerObserver { public: HighResolutionTimerManager(); @@ -32,4 +32,4 @@ class CONTENT_EXPORT HighResolutionTimerManager DISALLOW_COPY_AND_ASSIGN(HighResolutionTimerManager); }; -#endif // CONTENT_COMMON_HI_RES_TIMER_MANAGER_H_ +#endif // BASE_HI_RES_TIMER_MANAGER_H_ diff --git a/content/common/hi_res_timer_manager_posix.cc b/base/hi_res_timer_manager_posix.cc index 430902a..7c16eb7 100644 --- a/content/common/hi_res_timer_manager_posix.cc +++ b/base/hi_res_timer_manager_posix.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/hi_res_timer_manager.h" +#include "base/hi_res_timer_manager.h" // On POSIX we don't need to do anything special with the system timer. diff --git a/content/common/hi_res_timer_manager_unittest.cc b/base/hi_res_timer_manager_unittest.cc index a9fc7e1..07651ce 100644 --- a/content/common/hi_res_timer_manager_unittest.cc +++ b/base/hi_res_timer_manager_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/hi_res_timer_manager.h" +#include "base/hi_res_timer_manager.h" #include "base/memory/scoped_ptr.h" #include "base/system_monitor/system_monitor.h" diff --git a/content/common/hi_res_timer_manager_win.cc b/base/hi_res_timer_manager_win.cc index 62664b5..1a92394 100644 --- a/content/common/hi_res_timer_manager_win.cc +++ b/base/hi_res_timer_manager_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/hi_res_timer_manager.h" +#include "base/hi_res_timer_manager.h" #include "base/time.h" diff --git a/content/common/unix_domain_socket_posix.cc b/base/posix/unix_domain_socket.cc index 3e2e2ec..36f4c43 100644 --- a/content/common/unix_domain_socket_posix.cc +++ b/base/posix/unix_domain_socket.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/unix_domain_socket_posix.h" +#include "base/posix/unix_domain_socket.h" #include <errno.h> #include <unistd.h> diff --git a/content/common/unix_domain_socket_posix.h b/base/posix/unix_domain_socket.h index 055fb0f..e59be5d 100644 --- a/content/common/unix_domain_socket_posix.h +++ b/base/posix/unix_domain_socket.h @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_UNIX_DOMAIN_SOCKET_POSIX_H_ -#define CONTENT_COMMON_UNIX_DOMAIN_SOCKET_POSIX_H_ +#ifndef BASE_POSIX_UNIX_DOMAIN_SOCKET_H_ +#define BASE_POSIX_UNIX_DOMAIN_SOCKET_H_ #pragma once #include <stdint.h> #include <sys/types.h> #include <vector> -#include "content/common/content_export.h" +#include "base/base_export.h" class Pickle; -class CONTENT_EXPORT UnixDomainSocket { +class BASE_EXPORT UnixDomainSocket { public: // Use sendmsg to write the given msg and include a vector of file // descriptors. Returns true if successful. @@ -53,4 +53,4 @@ class CONTENT_EXPORT UnixDomainSocket { const Pickle& request); }; -#endif // CONTENT_COMMON_UNIX_DOMAIN_SOCKET_POSIX_H_ +#endif // BASE_POSIX_UNIX_DOMAIN_SOCKET_POSIX_H_ diff --git a/build/filename_rules.gypi b/build/filename_rules.gypi index 162e9b2..c6dceea 100644 --- a/build/filename_rules.gypi +++ b/build/filename_rules.gypi @@ -42,7 +42,11 @@ ], }], ['OS=="win"', { - 'sources/': [ ['exclude', '_posix(_unittest)?\\.(h|cc)$'] ], + 'sources/': [ + ['exclude', '_posix(_unittest)?\\.(h|cc)$'], + ['exclude', '(^|/)posix/'], + ], + }], ['chromeos!=1', { 'sources/': [ ['exclude', '_chromeos\\.(h|cc)$'] ] diff --git a/chrome/DEPS b/chrome/DEPS index f0a66f70..cb8c822 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -17,7 +17,8 @@ include_rules = [ "+chrome/test", # TODO(jam): remove me once chrome only consumes content/common through its # public headers. - "+content/common", + "+content/common/sandbox_mac.h", + "+content/common/sandbox_policy.h", "+content/public/common", "+content/public/test", "+content/test/gpu", diff --git a/chrome/app/breakpad_linuxish.cc b/chrome/app/breakpad_linuxish.cc index c6decb5..a953e3b 100644 --- a/chrome/app/breakpad_linuxish.cc +++ b/chrome/app/breakpad_linuxish.cc @@ -41,7 +41,7 @@ #include "chrome/common/chrome_version_info_posix.h" #include "chrome/common/env_vars.h" #include "chrome/common/logging_chrome.h" -#include "content/common/chrome_descriptors.h" +#include "content/public/common/content_descriptors.h" #if defined(OS_ANDROID) #include <android/log.h> diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index a303ee57..e00b553 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -29,7 +29,6 @@ #include "chrome/plugin/chrome_content_plugin_client.h" #include "chrome/renderer/chrome_content_renderer_client.h" #include "chrome/utility/chrome_content_utility_client.h" -#include "content/common/content_counters.h" #include "content/public/common/content_client.h" #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" @@ -574,8 +573,9 @@ void ChromeMainDelegate::PreSandboxStartup() { chrome::ProcessNeedsProfileDir(process_type))); } + base::StatsCounterTimer stats_counter_timer("Chrome.Init"); startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer> - (content::Counters::chrome_main())); + (stats_counter_timer)); // Enable the heap profiler as early as possible! EnableHeapProfiler(command_line); diff --git a/chrome/app/nacl_fork_delegate_linux.cc b/chrome/app/nacl_fork_delegate_linux.cc index 5ea4dd8..eae86c6 100644 --- a/chrome/app/nacl_fork_delegate_linux.cc +++ b/chrome/app/nacl_fork_delegate_linux.cc @@ -17,9 +17,9 @@ #include "base/logging.h" #include "base/file_path.h" #include "base/path_service.h" +#include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" -#include "content/common/unix_domain_socket_posix.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/nacl_helper_linux.h" diff --git a/chrome/nacl/nacl_exe_win_64.cc b/chrome/nacl/nacl_exe_win_64.cc index 00c2ce0..540f5d0 100644 --- a/chrome/nacl/nacl_exe_win_64.cc +++ b/chrome/nacl/nacl_exe_win_64.cc @@ -4,6 +4,7 @@ #include "base/at_exit.h" #include "base/command_line.h" +#include "base/hi_res_timer_manager.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/process_util.h" @@ -16,7 +17,6 @@ #include "chrome/nacl/nacl_broker_listener.h" #include "chrome/nacl/nacl_listener.h" #include "chrome/nacl/nacl_main_platform_delegate.h" -#include "content/common/hi_res_timer_manager.h" #include "content/public/app/startup_helper_win.h" #include "content/public/common/main_function_params.h" #include "content/public/common/sandbox_init.h" diff --git a/chrome/nacl/nacl_helper_linux.cc b/chrome/nacl/nacl_helper_linux.cc index 3c63f75..20ef4d2 100644 --- a/chrome/nacl/nacl_helper_linux.cc +++ b/chrome/nacl/nacl_helper_linux.cc @@ -20,9 +20,9 @@ #include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/message_loop.h" +#include "base/posix/unix_domain_socket.h" #include "base/rand_util.h" #include "chrome/nacl/nacl_listener.h" -#include "content/common/unix_domain_socket_posix.h" #include "crypto/nss_util.h" #include "ipc/ipc_switches.h" #include "native_client/src/trusted/service_runtime/sel_memory.h" diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index c69f4d2..d1cb3222 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -5,6 +5,7 @@ #include "build/build_config.h" #include "base/command_line.h" +#include "base/hi_res_timer_manager.h" #include "base/message_loop.h" #include "base/system_monitor/system_monitor.h" #include "chrome/common/chrome_result_codes.h" @@ -12,7 +13,6 @@ #include "chrome/common/logging_chrome.h" #include "chrome/nacl/nacl_listener.h" #include "chrome/nacl/nacl_main_platform_delegate.h" -#include "content/common/hi_res_timer_manager.h" #include "content/public/common/main_function_params.h" // main() routine for the NaCl loader process. diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 3d1a2e5..02eacd2 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -58,7 +58,7 @@ #include <signal.h> #include "base/global_descriptors_posix.h" -#include "content/common/chrome_descriptors.h" +#include "content/public/common/content_descriptors.h" #if !defined(OS_MACOSX) #include "content/public/common/zygote_fork_delegate_linux.h" diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index ac9ca7b..d9cf97d 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/debug/trace_event.h" +#include "base/hi_res_timer_manager.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/field_trial.h" @@ -25,7 +26,6 @@ #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" #include "content/browser/speech/speech_recognition_manager_impl.h" #include "content/browser/trace_controller_impl.h" -#include "content/common/hi_res_timer_manager.h" #include "content/public/browser/browser_main_parts.h" #include "content/public/browser/browser_shutdown.h" #include "content/public/browser/content_browser_client.h" diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 759ddad..fe6c710 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -14,9 +14,9 @@ #include "base/process_util.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" -#include "content/common/chrome_descriptors.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/common/content_descriptors.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index 1ef5288..8681ddd 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -22,13 +22,13 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/pickle.h" +#include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/shared_memory.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "content/common/font_config_ipc_linux.h" #include "content/common/sandbox_methods_linux.h" -#include "content/common/unix_domain_socket_posix.h" #include "content/common/webkitplatformsupport_impl.h" #include "skia/ext/SkFontHost_fontconfig_direct.h" #include "third_party/npapi/bindings/npapi_extensions.h" diff --git a/content/browser/zygote_host_impl_linux.cc b/content/browser/zygote_host_impl_linux.cc index 10214ec..61389b8 100644 --- a/content/browser/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host_impl_linux.cc @@ -20,13 +20,13 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/pickle.h" +#include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" -#include "content/common/unix_domain_socket_posix.h" #include "content/common/zygote_commands_linux.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_switches.h" diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc index bd9a7f2..5a07986 100644 --- a/content/common/child_process_sandbox_support_impl_linux.cc +++ b/content/common/child_process_sandbox_support_impl_linux.cc @@ -9,8 +9,8 @@ #include "base/eintr_wrapper.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" +#include "base/posix/unix_domain_socket.h" #include "content/common/sandbox_methods_linux.h" -#include "content/common/unix_domain_socket_posix.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebFontFamily.h" #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h" diff --git a/content/common/child_process_sandbox_support_impl_linux.h b/content/common/child_process_sandbox_support_impl_linux.h index fb15582..747a951 100644 --- a/content/common/child_process_sandbox_support_impl_linux.h +++ b/content/common/child_process_sandbox_support_impl_linux.h @@ -7,8 +7,8 @@ #pragma once #include "base/global_descriptors_posix.h" -#include "content/common/chrome_descriptors.h" #include "content/public/common/child_process_sandbox_support_linux.h" +#include "content/public/common/content_descriptors.h" namespace WebKit { struct WebFontFamily; diff --git a/content/common/child_process_sandbox_support_impl_shm_linux.cc b/content/common/child_process_sandbox_support_impl_shm_linux.cc index 5a81df1..4277382 100644 --- a/content/common/child_process_sandbox_support_impl_shm_linux.cc +++ b/content/common/child_process_sandbox_support_impl_shm_linux.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/pickle.h" +#include "base/posix/unix_domain_socket.h" #include "content/common/child_process_sandbox_support_impl_linux.h" #include "content/common/sandbox_methods_linux.h" -#include "content/common/unix_domain_socket_posix.h" namespace content { diff --git a/content/common/content_counters.cc b/content/common/content_counters.cc deleted file mode 100644 index 1718568..0000000 --- a/content/common/content_counters.cc +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/common/content_counters.h" - -#include "base/metrics/stats_counters.h" - -namespace content { - -using base::StatsCounterTimer; -using base::StatsRate; - -// Note: We use the construct-on-first-use pattern here, because we don't -// want to fight with any static initializer ordering problems later. -// The downside of this is that the objects don't ever get cleaned up. -// But they are small and this is okay. - -// Note: Because these are constructed on-first-use, there is a slight -// race condition - two threads could initialize the same counter. -// If this happened, the stats table would still work just fine; -// we'd leak the extraneous StatsCounter object once, and that -// would be it. But these are small objects, so this is ok. - -StatsCounterTimer& Counters::chrome_main() { - static StatsCounterTimer* ctr = new StatsCounterTimer("Chrome.Init"); - return *ctr; -} - -StatsCounterTimer& Counters::renderer_main() { - static StatsCounterTimer* ctr = new StatsCounterTimer("Chrome.RendererInit"); - return *ctr; -} - -} // namespace content diff --git a/content/common/content_counters.h b/content/common/content_counters.h deleted file mode 100644 index be8787b..0000000 --- a/content/common/content_counters.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Counters used within the browser. - -#ifndef CONTENT_COMMON_CONTENT_COUNTERS_H_ -#define CONTENT_COMMON_CONTENT_COUNTERS_H_ -#pragma once - -#include "content/common/content_export.h" - -namespace base { -class StatsCounter; -class StatsCounterTimer; -} - -namespace content { - -class Counters { - public: - // The amount of time spent in chrome initialization. - CONTENT_EXPORT static base::StatsCounterTimer& chrome_main(); - - // The amount of time spent in renderer initialization. - static base::StatsCounterTimer& renderer_main(); -}; - -} // namespace content - -#endif // CONTENT_COMMON_CONTENT_COUNTERS_H_ diff --git a/content/common/font_config_ipc_linux.cc b/content/common/font_config_ipc_linux.cc index 13ea2296..ca37889 100644 --- a/content/common/font_config_ipc_linux.cc +++ b/content/common/font_config_ipc_linux.cc @@ -11,7 +11,7 @@ #include <sys/uio.h> #include "base/pickle.h" -#include "content/common/unix_domain_socket_posix.h" +#include "base/posix/unix_domain_socket.h" FontConfigIPC::FontConfigIPC(int fd) : fd_(fd) { diff --git a/content/content_common.gypi b/content/content_common.gypi index 3863919..16b13f6 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -36,6 +36,7 @@ 'public/common/child_process_sandbox_support_linux.h', 'public/common/content_constants.cc', 'public/common/content_constants.h', + 'public/common/content_descriptors.h', 'public/common/content_paths.h', 'public/common/content_restriction.h', 'public/common/content_switches.cc', @@ -117,14 +118,11 @@ 'common/child_thread.h', 'common/child_trace_message_filter.cc', 'common/child_trace_message_filter.h', - 'common/chrome_descriptors.h', 'common/clipboard_messages.cc', 'common/clipboard_messages.h', 'common/content_message_generator.cc', 'common/content_message_generator.h', 'common/content_export.h', - 'common/content_counters.cc', - 'common/content_counters.h', 'common/content_paths.cc', 'common/css_colors.h', 'common/database_messages.h', @@ -205,9 +203,6 @@ 'common/gpu/texture_image_transport_surface.cc', 'common/handle_enumerator_win.cc', 'common/handle_enumerator_win.h', - 'common/hi_res_timer_manager_posix.cc', - 'common/hi_res_timer_manager_win.cc', - 'common/hi_res_timer_manager.h', 'common/indexed_db/indexed_db_key.cc', 'common/indexed_db/indexed_db_key.h', 'common/indexed_db/indexed_db_key_path.cc', @@ -318,8 +313,6 @@ 'common/swapped_out_messages.cc', 'common/swapped_out_messages.h', 'common/text_input_client_messages.h', - 'common/unix_domain_socket_posix.cc', - 'common/unix_domain_socket_posix.h', 'common/url_schemes.cc', 'common/url_schemes.h', 'common/utility_messages.h', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index b7a742c..bde98e2 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -283,7 +283,6 @@ 'common/mac/font_descriptor_unittest.mm', 'common/gpu/gpu_info_unittest.cc', 'common/gpu/gpu_memory_manager_unittest.cc', - 'common/hi_res_timer_manager_unittest.cc', 'common/indexed_db/indexed_db_dispatcher_unittest.cc', 'common/inter_process_time_ticks_converter_unittest.cc', 'common/net/url_fetcher_impl_unittest.cc', diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc index 64a91c6..204fbe7 100644 --- a/content/plugin/plugin_main.cc +++ b/content/plugin/plugin_main.cc @@ -11,12 +11,12 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/hi_res_timer_manager.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "content/common/child_process.h" -#include "content/common/hi_res_timer_manager.h" #include "content/plugin/plugin_thread.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" diff --git a/content/common/chrome_descriptors.h b/content/public/common/content_descriptors.h index 166467d..c9d32bd 100644 --- a/content/common/chrome_descriptors.h +++ b/content/public/common/content_descriptors.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_CHROME_DESCRIPTORS_H_ -#define CONTENT_COMMON_CHROME_DESCRIPTORS_H_ +#ifndef CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_ +#define CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_ #pragma once #include "ipc/ipc_descriptors.h" @@ -15,4 +15,4 @@ enum { kSandboxIPCChannel = kPrimaryIPCChannel + 2, // http://code.google.com/p/chromium/LinuxSandboxIPC }; -#endif // CONTENT_COMMON_CHROME_DESCRIPTORS_H_ +#endif // CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_ diff --git a/content/public/test/render_view_fake_resources_test.h b/content/public/test/render_view_fake_resources_test.h index 6af69d5..0cf467f 100644 --- a/content/public/test/render_view_fake_resources_test.h +++ b/content/public/test/render_view_fake_resources_test.h @@ -47,8 +47,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "content/public/renderer/render_view_visitor.h" #include "content/public/renderer/content_renderer_client.h" +#include "content/public/renderer/render_view_visitor.h" #include "ipc/ipc_channel.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 07d5313..b98030b 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/debug/trace_event.h" +#include "base/hi_res_timer_manager.h" #include "base/i18n/rtl.h" #include "base/memory/ref_counted.h" #include "base/metrics/field_trial.h" @@ -18,8 +19,6 @@ #include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "base/time.h" -#include "content/common/content_counters.h" -#include "content/common/hi_res_timer_manager.h" #include "content/common/pepper_plugin_registry.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" @@ -188,8 +187,8 @@ int RendererMain(const content::MainFunctionParams& parameters) { content::GetContentClient()->renderer()->RegisterPPAPIInterfaceFactories( factory_manager); - base::StatsScope<base::StatsCounterTimer> - startup_timer(content::Counters::renderer_main()); + base::StatsCounterTimer stats_counter_timer("Content.RendererInit"); + base::StatsScope<base::StatsCounterTimer> startup_timer(stats_counter_timer); RendererMessageLoopObserver task_observer; #if defined(OS_MACOSX) diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc index acbd799..dd7c571 100644 --- a/content/utility/utility_main.cc +++ b/content/utility/utility_main.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/hi_res_timer_manager.h" #include "base/message_loop.h" #include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "content/common/child_process.h" -#include "content/common/hi_res_timer_manager.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/utility/utility_thread_impl.h" diff --git a/content/worker/worker_main.cc b/content/worker/worker_main.cc index fafd991..31b4c57 100644 --- a/content/worker/worker_main.cc +++ b/content/worker/worker_main.cc @@ -4,12 +4,12 @@ #include "base/base_switches.h" #include "base/command_line.h" +#include "base/hi_res_timer_manager.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "content/common/child_process.h" -#include "content/common/hi_res_timer_manager.h" #include "content/public/common/main_function_params.h" #include "content/public/common/sandbox_init.h" #include "content/worker/worker_thread.h" diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc index ab3ead3..0258ace 100644 --- a/content/zygote/zygote_linux.cc +++ b/content/zygote/zygote_linux.cc @@ -23,13 +23,13 @@ #include "base/global_descriptors_posix.h" #include "base/logging.h" #include "base/pickle.h" -#include "content/common/chrome_descriptors.h" +#include "base/posix/unix_domain_socket.h" #include "content/common/seccomp_sandbox.h" #include "content/common/set_process_title.h" -#include "content/common/unix_domain_socket_posix.h" -#include "content/public/common/zygote_fork_delegate_linux.h" #include "content/common/sandbox_methods_linux.h" #include "content/common/zygote_commands_linux.h" +#include "content/public/common/content_descriptors.h" +#include "content/public/common/zygote_fork_delegate_linux.h" #if defined(CHROMIUM_SELINUX) #include <selinux/selinux.h> diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 6653909..5936ee2 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -20,6 +20,7 @@ #include "base/linux_util.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" +#include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/rand_util.h" #include "base/sys_info.h" @@ -29,7 +30,6 @@ #include "content/common/pepper_plugin_registry.h" #include "content/common/sandbox_methods_linux.h" #include "content/common/seccomp_sandbox.h" -#include "content/common/unix_domain_socket_posix.h" #include "content/common/zygote_commands_linux.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" |