Tighten up DEPS some more. NaCl/service process code are including in…

…ternal content files. Fix the instances other sandbox stuff, which I'll do in a followup.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10512010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140346 0039d316-1c4b-4281-b951-d872f2087c98

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',

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',

content/common/hi_res_timer_manager.h → 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_

content/common/hi_res_timer_manager_posix.cc → 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.
 

content/common/hi_res_timer_manager_unittest.cc → 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"

content/common/hi_res_timer_manager_win.cc → 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"
 

content/common/unix_domain_socket_posix.cc → 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>

content/common/unix_domain_socket_posix.h → 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_

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)$'] ]

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",

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>

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);

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"

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"

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"

chrome/nacl/nacl_main.cc

@@ -5,14 +5,14 @@
 #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"
 #include "chrome/common/chrome_switches.h"
 #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.

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"

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"

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"
 

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"

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"

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"
 

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;

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 {
 

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) {