Move some chrome\common code to content in preparation for moving chrome\gpu.

TBR=avi
Review URL: http://codereview.chromium.org/6686002

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

68 files changed, 188 insertions, 181 deletions

diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index a1113b8..4aec819 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -32,14 +32,14 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/profiling.h"
-#include "chrome/common/sandbox_init_wrapper.h"
 #include "chrome/common/set_process_title.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/content_client.h"
 #include "content/common/content_paths.h"
+#include "content/common/main_function_params.h"
+#include "content/common/sandbox_init_wrapper.h"
 #include "ipc/ipc_switches.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
diff --git a/chrome/app/dummy_main_functions.cc b/chrome/app/dummy_main_functions.cc
index 77867de..bb0b5e5 100644
--- a/chrome/app/dummy_main_functions.cc
+++ b/chrome/app/dummy_main_functions.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
+#include "content/common/main_function_params.h"
 
 // Native Client binary for 64-bit Windows can run only the NaCl loader or
 // the sandbox broker processes. Other process types are not supported.
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 3f58bcc..4f14f14 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -82,7 +82,6 @@
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/net/net_resource_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
@@ -92,6 +91,7 @@
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/common/child_process.h"
+#include "content/common/main_function_params.h"
 #include "grit/app_locale_settings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm
index 15ee489..79ccb46 100644
--- a/chrome/browser/browser_main_mac.mm
+++ b/chrome/browser/browser_main_mac.mm
@@ -22,8 +22,8 @@
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
+#include "content/common/main_function_params.h"
 #include "net/socket/client_socket_factory.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index bfc872b..06f99f0 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -25,12 +25,12 @@
 #include "chrome/browser/ui/views/uninstall_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
+#include "content/common/main_function_params.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/winsock_init.h"
diff --git a/chrome/browser/chrome_browser_application_mac.h b/chrome/browser/chrome_browser_application_mac.h
index a1ebb04..510fa5b 100644
--- a/chrome/browser/chrome_browser_application_mac.h
+++ b/chrome/browser/chrome_browser_application_mac.h
@@ -8,7 +8,7 @@
 
 #ifdef __OBJC__
 
-#import "chrome/common/chrome_application_mac.h"
+#import "content/common/chrome_application_mac.h"
 
 @interface BrowserCrApplication : CrApplication
 // Our implementation of |-terminate:| only attempts to terminate the
diff --git a/chrome/browser/tab_contents/popup_menu_helper_mac.mm b/chrome/browser/tab_contents/popup_menu_helper_mac.mm
index a1324a7..1c4e0fb 100644
--- a/chrome/browser/tab_contents/popup_menu_helper_mac.mm
+++ b/chrome/browser/tab_contents/popup_menu_helper_mac.mm
@@ -10,8 +10,8 @@
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 #import "chrome/browser/ui/cocoa/base_view.h"
-#import "chrome/common/chrome_application_mac.h"
 #include "content/browser/renderer_host/render_view_host.h"
+#import "content/common/chrome_application_mac.h"
 #include "content/common/notification_source.h"
 #include "webkit/glue/webmenurunner_mac.h"
 
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index 0b5c377..fd2cd1e 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -18,13 +18,13 @@
 #import "chrome/browser/ui/cocoa/tab_contents/web_drag_source.h"
 #import "chrome/browser/ui/cocoa/tab_contents/web_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
-#import "chrome/common/chrome_application_mac.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
+#import "content/common/chrome_application_mac.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
index 2598c70..67a9bf4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
@@ -17,7 +17,7 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #include "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
-#import "chrome/common/chrome_application_mac.h"
+#import "content/common/chrome_application_mac.h"
 #include "webkit/glue/window_open_disposition.h"
 
 @class BookmarkBarController;
diff --git a/chrome/browser/ui/cocoa/cocoa_test_helper.h b/chrome/browser/ui/cocoa/cocoa_test_helper.h
index d7eb150..d7e5692 100644
--- a/chrome/browser/ui/cocoa/cocoa_test_helper.h
+++ b/chrome/browser/ui/cocoa/cocoa_test_helper.h
@@ -11,8 +11,8 @@
 #include "base/path_service.h"
 #import "base/mac/scoped_nsautorelease_pool.h"
 #import "base/scoped_nsobject.h"
-#import "chrome/common/chrome_application_mac.h"
 #include "chrome/common/chrome_constants.h"
+#import "content/common/chrome_application_mac.h"
 #include "testing/platform_test.h"
 
 // Background windows normally will not display things such as focus
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 50ba4c0..cfa8da4 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -35,8 +35,6 @@
           'common/child_process_logging_linux.cc',
           'common/child_process_logging_mac.mm',
           'common/child_process_logging_win.cc',
-          'common/chrome_application_mac.h',
-          'common/chrome_application_mac.mm',
           'common/chrome_counters.cc',
           'common/chrome_counters.h',
           'common/chrome_version_info.cc',
@@ -53,16 +51,12 @@
           'common/content_settings_helper.h',
           'common/content_settings_types.h',
           'common/database_messages.h',
-          'common/debug_flags.cc',
-          'common/debug_flags.h',
           'common/devtools_messages.cc',
           'common/devtools_messages.h',
           'common/devtools_messages_internal.h',
           'common/dom_storage_messages.cc',
           'common/dom_storage_messages.h',
           'common/file_utilities_messages.h',
-          'common/font_descriptor_mac.h',
-          'common/font_descriptor_mac.mm',
           'common/font_config_ipc_linux.cc',
           'common/font_config_ipc_linux.h',
           'common/geoposition.cc',
@@ -86,7 +80,6 @@
           'common/instant_types.h',
           'common/logging_chrome.cc',
           'common/logging_chrome.h',
-          'common/main_function_params.h',
           'common/metrics_helpers.cc',
           'common/metrics_helpers.h',
           'common/mime_registry_messages.h',
@@ -113,12 +106,6 @@
           'common/ref_counted_util.h',
           'common/result_codes.h',
           'common/safebrowsing_messages.h',
-          'common/sandbox_init_wrapper.h',
-          'common/sandbox_init_wrapper_linux.cc',
-          'common/sandbox_init_wrapper_mac.cc',
-          'common/sandbox_init_wrapper_win.cc',
-          'common/sandbox_mac.h',
-          'common/sandbox_mac.mm',
           'common/sandbox_policy.cc',
           'common/sandbox_policy.h',
           'common/section_util_win.cc',
@@ -261,8 +248,6 @@
         'common/extensions/url_pattern.h',
         'common/extensions/user_script.cc',
         'common/extensions/user_script.h',
-        'common/font_loader_mac.h',
-        'common/font_loader_mac.mm',
         'common/gears_api.h',
         'common/important_file_writer.cc',
         'common/important_file_writer.h',
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 71bd20a..0661678d 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -603,9 +603,11 @@
             '../content/common/content_client.cc',
             '../content/common/content_paths.cc',
             '../content/common/content_switches.cc',
+            '../content/common/debug_flags.cc',
             '../content/common/notification_details.cc',
             '../content/common/notification_service.cc',
             '../content/common/notification_source.cc',
+            '../content/common/sandbox_init_wrapper_win.cc',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 8285db2..7a4bea3 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1730,7 +1730,6 @@
         'common/extensions/update_manifest_unittest.cc',
         'common/extensions/url_pattern_unittest.cc',
         'common/extensions/user_script_unittest.cc',
-        'common/font_descriptor_mac_unittest.mm',
         'common/gpu_feature_flags_unittest.cc',
         'common/guid_unittest.cc',
         'common/important_file_writer_unittest.cc',
@@ -1748,11 +1747,6 @@
         'common/net/url_fetcher_unittest.cc',
         'common/process_watcher_unittest.cc',
         'common/render_messages_unittest.cc',
-        'common/sandbox_mac_diraccess_unittest.mm',
-        'common/sandbox_mac_fontloading_unittest.mm',
-        'common/sandbox_mac_unittest_helper.h',
-        'common/sandbox_mac_unittest_helper.mm',
-        'common/sandbox_mac_system_access_unittest.mm',
         'common/service_process_util_unittest.cc',
         'common/switch_utils_unittest.cc',
         'common/thumbnail_score_unittest.cc',
@@ -1839,10 +1833,16 @@
         '../content/browser/tab_contents/navigation_entry_unittest.cc',
         '../content/browser/tab_contents/render_view_host_manager_unittest.cc',
         '../content/browser/webui/web_ui_unittest.cc',
+        '../content/common/font_descriptor_mac_unittest.mm',
         '../content/common/gpu_info_unittest.cc',
         '../content/common/notification_service_unittest.cc',
         '../content/common/property_bag_unittest.cc',
         '../content/common/resource_dispatcher_unittest.cc',
+        '../content/common/sandbox_mac_diraccess_unittest.mm',
+        '../content/common/sandbox_mac_fontloading_unittest.mm',
+        '../content/common/sandbox_mac_unittest_helper.h',
+        '../content/common/sandbox_mac_unittest_helper.mm',
+        '../content/common/sandbox_mac_system_access_unittest.mm',
         '../testing/gtest_mac_unittest.mm',
         '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
         '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc',
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 6effd95..d45118e 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -146,12 +146,6 @@ const char kDevicePolicyCacheDir[]          = "device-policy-cache-dir";
 // Triggers a pletora of diagnostic modes.
 const char kDiagnostics[]                   = "diagnostics";
 
-// Disables client-visible 3D APIs, in particular WebGL and Pepper 3D.
-// This is controlled by policy and is kept separate from the other
-// enable/disable switches to avoid accidentally regressing the policy
-// support for controlling access to these APIs.
-const char kDisable3DAPIs[]                 = "disable-3d-apis";
-
 // Disables accelerated compositing.
 const char kDisableAcceleratedCompositing[] =
     "disable-accelerated-compositing";
@@ -224,9 +218,6 @@ const char kDisableDeviceOrientation[]      = "disable-device-orientation";
 // disables such behavior.
 const char kDisableEnforcedThrottling[]     = "disable-enforced-throttling";
 
-// Disable experimental WebGL support.
-const char kDisableExperimentalWebGL[]      = "disable-webgl";
-
 // Disable extensions.
 const char kDisableExtensions[]             = "disable-extensions";
 
@@ -594,9 +585,6 @@ const char kExperimentalSpellcheckerFeatures[] =
 // numbers.
 const char kExplicitlyAllowedPorts[]        = "explicitly-allowed-ports";
 
-// Causes the process to run as an extension subprocess.
-const char kExtensionProcess[]              = "extension";
-
 // Frequency in seconds for Extensions auto-update.
 const char kExtensionsUpdateFrequency[]     = "extensions-update-frequency";
 
@@ -698,9 +686,6 @@ const char kImportFromFile[]                = "import-from-file";
 // Runs plugins inside the renderer process
 const char kInProcessPlugins[]              = "in-process-plugins";
 
-// Runs WebGL inside the renderer process.
-const char kInProcessWebGL[]                = "in-process-webgl";
-
 // Causes the browser to launch directly in incognito mode.
 const char kIncognito[]                     = "incognito";
 
@@ -758,9 +743,6 @@ const char kNaClDebugPorts[]                = "nacl-debug-ports";
 // (used for launching NaCl loader processes on 64-bit Windows).
 const char kNaClBrokerProcess[]             = "nacl-broker";
 
-// Causes the process to run as a NativeClient loader.
-const char kNaClLoaderProcess[]             = "nacl-loader";
-
 // Causes the Native Client process to display a dialog on launch.
 const char kNaClStartupDialog[]             = "nacl-startup-dialog";
 
@@ -796,9 +778,6 @@ const char kNoPings[]                       = "no-pings";
 // other proxy server flags that are passed.
 const char kNoProxyServer[]                 = "no-proxy-server";
 
-// Disables the sandbox for all process types that are normally sandboxed.
-const char kNoSandbox[]                     = "no-sandbox";
-
 // Disables the service process from adding itself as an autorun process. This
 // does not delete existing autorun registrations, it just prevents the service
 // from registering a new one.
@@ -859,9 +838,6 @@ const char kPrint[]                         = "print";
 // detect the installed version of Chrome on Linux.
 const char kProductVersion[]                = "product-version";
 
-// Causes the process to run as a profile import subprocess.
-const char kProfileImportProcess[]          = "profile-import";
-
 // Starts the sampling based profiler for the browser process at
 // startup. This will only work if chrome has been built with
 // the gyp variable profiling=1. The output will go to the value
@@ -971,9 +947,6 @@ const char kSdchFilter[]                    = "enable-sdch";
 // from the omnibox.
 const char kSearchInOmniboxHint[]           = "search-in-omnibox-hint";
 
-// Causes the process to run as a service process.
-const char kServiceProcess[]                = "service";
-
 // The LSID of the account to use for the service process.
 const char kServiceAccountLsid[]            = "service-account-lsid";
 
@@ -1088,13 +1061,6 @@ const char kUserScriptsDir[]                = "user-scripts-dir";
 // --args".
 const char kUtilityCmdPrefix[]              = "utility-cmd-prefix";
 
-// Causes the process to run as a utility subprocess.
-const char kUtilityProcess[]                = "utility";
-
-// The utility process is sandboxed, with access to one directory. This flag
-// specifies the directory that can be accessed.
-const char kUtilityProcessAllowedDir[]      = "utility-allowed-dir";
-
 // Print version information and quit.
 const char kVersion[]                       = "version";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 43975fe..cd2e128 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -56,7 +56,6 @@ extern const char kDebugPrint[];
 extern const char kDeviceManagementUrl[];
 extern const char kDevicePolicyCacheDir[];
 extern const char kDiagnostics[];
-extern const char kDisable3DAPIs[];
 extern const char kDisableAcceleratedCompositing[];
 extern const char kDisableAcceleratedLayers[];
 extern const char kDisableAcceleratedVideo[];
@@ -75,7 +74,6 @@ extern const char kDisableDesktopNotifications[];
 extern const char kDisableDevTools[];
 extern const char kDisableDeviceOrientation[];
 extern const char kDisableEnforcedThrottling[];
-extern const char kDisableExperimentalWebGL[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisableExtensions[];
 extern const char kDisableFlashSandbox[];
@@ -175,7 +173,6 @@ extern const char kEnableWatchdog[];
 extern const char kEnableWebAudio[];
 extern const char kExperimentalSpellcheckerFeatures[];
 extern const char kExplicitlyAllowedPorts[];
-extern const char kExtensionProcess[];
 extern const char kExtensionsUpdateFrequency[];
 extern const char kFlagSwitchesBegin[];
 extern const char kFlagSwitchesEnd[];
@@ -199,7 +196,6 @@ extern const char kIgnoreGpuBlacklist[];
 extern const char kImport[];
 extern const char kImportFromFile[];
 extern const char kInProcessPlugins[];
-extern const char kInProcessWebGL[];
 extern const char kIncognito[];
 extern const char kInstantURL[];
 extern const char kJavaScriptFlags[];
@@ -217,7 +213,6 @@ extern const char kMultiProfiles[];
 extern const char kNaClDebugIP[];
 extern const char kNaClDebugPorts[];
 extern const char kNaClBrokerProcess[];
-extern const char kNaClLoaderProcess[];
 extern const char kNaClStartupDialog[];
 extern const char kNoDefaultBrowserCheck[];
 extern const char kNoEvents[];
@@ -226,7 +221,6 @@ extern const char kNoFirstRun[];
 extern const char kNoJsRandomness[];
 extern const char kNoProxyServer[];
 extern const char kNoPings[];
-extern const char kNoSandbox[];
 extern const char kNoServiceAutorun[];
 extern const char kNoStartupWindow[];
 extern const char kNotifyCloudPrintTokenExpired[];
@@ -245,7 +239,6 @@ extern const char kPrerenderSwitchValueEnabled[];
 extern const char kPrerenderSwitchValuePrefetchOnly[];
 extern const char kPrint[];
 extern const char kProductVersion[];
-extern const char kProfileImportProcess[];
 extern const char kProfilingAtStart[];
 extern const char kProfilingFile[];
 extern const char kProfilingFlush[];
@@ -267,7 +260,6 @@ extern const char kSbDisableDownloadProtection[];
 extern const char kSbEnableDownloadWarningUI[];
 extern const char kSdchFilter[];
 extern const char kSearchInOmniboxHint[];
-extern const char kServiceProcess[];
 extern const char kServiceAccountLsid[];
 extern const char kShowCompositedLayerBorders[];
 extern const char kShowCompositedLayerTree[];
@@ -299,8 +291,6 @@ extern const char kMaxSpdyConcurrentStreams[];
 extern const char kUserDataDir[];
 extern const char kUserScriptsDir[];
 extern const char kUtilityCmdPrefix[];
-extern const char kUtilityProcess[];
-extern const char kUtilityProcessAllowedDir[];
 extern const char kVersion[];
 extern const char kWinHttpProxyResolver[];
 
diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index 9ba1106..e7068d5 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -24,7 +24,7 @@
 #include "webkit/plugins/npapi/webplugin.h"
 
 #if defined(OS_MACOSX)
-#include "chrome/common/font_descriptor_mac.h"
+#include "content/common/font_descriptor_mac.h"
 #endif
 
 #define IPC_MESSAGE_IMPL
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 6873afe..dcbca37 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -38,7 +38,7 @@
 #endif
 
 #if defined(OS_MACOSX)
-#include "chrome/common/font_descriptor_mac.h"
+#include "content/common/font_descriptor_mac.h"
 #endif
 
 // TODO(mpcomplete): rename ViewMsg and ViewHostMsg to something that makes
diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc
index 319f181..756346e 100644
--- a/chrome/common/sandbox_policy.cc
+++ b/chrome/common/sandbox_policy.cc
@@ -20,8 +20,8 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/debug_flags.h"
 #include "content/common/child_process_info.h"
+#include "content/common/debug_flags.h"
 #include "sandbox/src/sandbox.h"
 
 static sandbox::BrokerServices* g_broker_services = NULL;
diff --git a/chrome/gpu/gpu_main.cc b/chrome/gpu/gpu_main.cc
index a2b9e5f..16a3add 100644
--- a/chrome/gpu/gpu_main.cc
+++ b/chrome/gpu/gpu_main.cc
@@ -14,14 +14,14 @@
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
-#include "chrome/common/main_function_params.h"
 #include "content/common/content_switches.h"
+#include "content/common/main_function_params.h"
 #include "chrome/gpu/gpu_config.h"
 #include "chrome/gpu/gpu_process.h"
 #include "chrome/gpu/gpu_thread.h"
 
 #if defined(OS_MACOSX)
-#include "chrome/common/chrome_application_mac.h"
+#include "content/common/chrome_application_mac.h"
 #endif
 
 #if defined(USE_X11)
diff --git a/chrome/gpu/gpu_thread.cc b/chrome/gpu/gpu_thread.cc
index 11ff453..a944907 100644
--- a/chrome/gpu/gpu_thread.cc
+++ b/chrome/gpu/gpu_thread.cc
@@ -22,8 +22,8 @@
 #include "ipc/ipc_channel_handle.h"
 
 #if defined(OS_MACOSX)
-#include "chrome/common/sandbox_init_wrapper.h"
-#include "chrome/common/sandbox_mac.h"
+#include "content/common/sandbox_init_wrapper.h"
+#include "content/common/sandbox_mac.h"
 #elif defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
 #endif
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index 11194d9..b026c78 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -15,12 +15,12 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/hi_res_timer_manager.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/common/sandbox_policy.h"
 #include "chrome/nacl/nacl_main_platform_delegate.h"
 #include "chrome/nacl/nacl_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/main_function_params.h"
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/nacl/nacl_main_platform_delegate.h b/chrome/nacl/nacl_main_platform_delegate.h
index 007f346..b1c56f6 100644
--- a/chrome/nacl/nacl_main_platform_delegate.h
+++ b/chrome/nacl/nacl_main_platform_delegate.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/native_library.h"
-#include "chrome/common/main_function_params.h"
+#include "content/common/main_function_params.h"
 
 typedef bool (*RunNaClLoaderTests)(void);
 const char kNaClLoaderTestCall[] = "RunNaClLoaderTests";
diff --git a/chrome/nacl/nacl_main_platform_delegate_mac.mm b/chrome/nacl/nacl_main_platform_delegate_mac.mm
index 39ba8c8..19e7df7 100644
--- a/chrome/nacl/nacl_main_platform_delegate_mac.mm
+++ b/chrome/nacl/nacl_main_platform_delegate_mac.mm
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/sandbox_mac.h"
+#include "content/common/sandbox_mac.h"
 
 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
     const MainFunctionParams& parameters)
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index fa45585..a3e9174 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -18,9 +18,9 @@
 #include "chrome/common/default_plugin.h"
 #include "chrome/common/hi_res_timer_manager.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/main_function_params.h"
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/plugin/plugin_main_mac.mm b/chrome/plugin/plugin_main_mac.mm
index 5d10a3b..122dc39 100644
--- a/chrome/plugin/plugin_main_mac.mm
+++ b/chrome/plugin/plugin_main_mac.mm
@@ -5,9 +5,9 @@
 #include "base/environment.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
-#include "chrome/common/chrome_application_mac.h"
 #include "chrome/common/plugin_carbon_interpose_constants_mac.h"
 #include "chrome/plugin/plugin_interpose_util_mac.h"
+#include "content/common/chrome_application_mac.h"
 
 #if !defined(__LP64__)
 void TrimInterposeEnvironment() {
diff --git a/chrome/ppapi_plugin/ppapi_plugin_main.cc b/chrome/ppapi_plugin/ppapi_plugin_main.cc
index 801c46a..dfa5a92 100644
--- a/chrome/ppapi_plugin/ppapi_plugin_main.cc
+++ b/chrome/ppapi_plugin/ppapi_plugin_main.cc
@@ -6,9 +6,9 @@
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/ppapi_plugin/ppapi_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/main_function_params.h"
 
 // Main function for starting the PPAPI plugin process.
 int PpapiPluginMain(const MainFunctionParams& parameters) {
diff --git a/chrome/profile_import/profile_import_main.cc b/chrome/profile_import/profile_import_main.cc
index 037ea22..9b07737 100644
--- a/chrome/profile_import/profile_import_main.cc
+++ b/chrome/profile_import/profile_import_main.cc
@@ -8,9 +8,9 @@
 #include "base/threading/platform_thread.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/profile_import/profile_import_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/main_function_params.h"
 
 // Mainline routine for running as the profile import process.
 int ProfileImportMain(const MainFunctionParams& parameters) {
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc
index 7ac5760..985350b 100644
--- a/chrome/renderer/renderer_main.cc
+++ b/chrome/renderer/renderer_main.cc
@@ -25,12 +25,12 @@
 #include "chrome/common/gfx_resource_provider.h"
 #include "chrome/common/hi_res_timer_manager.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/net/net_resource_provider.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "chrome/renderer/render_process_impl.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/main_function_params.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_module.h"
 #include "ui/base/system_monitor/system_monitor.h"
diff --git a/chrome/renderer/renderer_main_platform_delegate.h b/chrome/renderer/renderer_main_platform_delegate.h
index 9a8b38b..c57e90e 100644
--- a/chrome/renderer/renderer_main_platform_delegate.h
+++ b/chrome/renderer/renderer_main_platform_delegate.h
@@ -6,7 +6,7 @@
 #define CHROME_RENDERER_RENDERER_MAIN_PLATFORM_DELEGATE_H_
 #pragma once
 
-#include "chrome/common/main_function_params.h"
+#include "content/common/main_function_params.h"
 
 class RendererMainPlatformDelegate {
  public:
diff --git a/chrome/renderer/renderer_main_platform_delegate_mac.mm b/chrome/renderer/renderer_main_platform_delegate_mac.mm
index 4da959e..d3ac431 100644
--- a/chrome/renderer/renderer_main_platform_delegate_mac.mm
+++ b/chrome/renderer/renderer_main_platform_delegate_mac.mm
@@ -7,9 +7,9 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
-#import "chrome/common/chrome_application_mac.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/sandbox_mac.h"
+#import "content/common/chrome_application_mac.h"
+#include "content/common/sandbox_mac.h"
 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 
 RendererMainPlatformDelegate::RendererMainPlatformDelegate(
diff --git a/chrome/renderer/renderer_main_unittest.cc b/chrome/renderer/renderer_main_unittest.cc
index 653e02f..ad26a78 100644
--- a/chrome/renderer/renderer_main_unittest.cc
+++ b/chrome/renderer/renderer_main_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/main_function_params.h"
+#include "content/common/main_function_params.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index ae149a6..542bb21 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -50,8 +50,8 @@
 #endif
 
 #if defined(OS_MACOSX)
-#include "chrome/common/font_descriptor_mac.h"
-#include "chrome/common/font_loader_mac.h"
+#include "content/common/font_descriptor_mac.h"
+#include "content/common/font_loader_mac.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h"
 #endif
 
diff --git a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
index 06c6164..b6aa02f 100644
--- a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
+++ b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
@@ -10,16 +10,16 @@
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "chrome/common/dom_storage_common.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
-#include "chrome/common/sandbox_init_wrapper.h"
 #include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
+#include "content/common/main_function_params.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_response.h"
+#include "content/common/sandbox_init_wrapper.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
diff --git a/chrome/service/service_main.cc b/chrome/service/service_main.cc
index 86d3de1..b87f510 100644
--- a/chrome/service/service_main.cc
+++ b/chrome/service/service_main.cc
@@ -5,14 +5,14 @@
 #include "base/debug/debugger.h"
 #include "base/message_loop.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/service_process_util.h"
 #include "chrome/service/service_process.h"
+#include "content/common/main_function_params.h"
 
 #if defined(OS_WIN)
 #include "chrome/common/sandbox_policy.h"
 #elif defined(OS_MACOSX)
-#include "chrome/common/chrome_application_mac.h"
+#include "content/common/chrome_application_mac.h"
 #endif  // defined(OS_WIN)
 
 // Mainline routine for running as the service process.
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index e6cd724..baeff496 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -17,7 +17,6 @@
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/debug_flags.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/chrome_process_util.h"
@@ -26,6 +25,7 @@
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/common/child_process_info.h"
+#include "content/common/debug_flags.h"
 
 namespace {
 
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 21790c3..0fda2e5 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -27,7 +27,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/testing_browser_process.h"
@@ -35,6 +34,7 @@
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/common/main_function_params.h"
 #include "content/common/notification_type.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/test/test_server.h"
diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h
index 96e9c77..c83a8d4 100644
--- a/chrome/test/render_view_test.h
+++ b/chrome/test/render_view_test.h
@@ -10,14 +10,14 @@
 
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/native_web_keyboard_event.h"
-#include "chrome/common/sandbox_init_wrapper.h"
 #include "chrome/renderer/mock_keyboard.h"
 #include "chrome/renderer/mock_render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "chrome/renderer/renderer_webkitclient_impl.h"
+#include "content/common/main_function_params.h"
+#include "content/common/sandbox_init_wrapper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 2424006..11314fe 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -36,7 +36,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/debug_flags.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/url_constants.h"
@@ -49,6 +48,7 @@
 #include "chrome/test/chrome_process_util.h"
 #include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/test_switches.h"
+#include "content/common/debug_flags.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
diff --git a/chrome/test/unit/chrome_test_suite.cc b/chrome/test/unit/chrome_test_suite.cc
index 28f55e7..d6860ca 100644
--- a/chrome/test/unit/chrome_test_suite.cc
+++ b/chrome/test/unit/chrome_test_suite.cc
@@ -23,7 +23,7 @@
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
-#include "chrome/common/chrome_application_mac.h"
+#include "content/common/chrome_application_mac.h"
 #endif
 
 #if defined(OS_POSIX)
diff --git a/chrome/utility/utility_main.cc b/chrome/utility/utility_main.cc
index 2a45459..ef84260 100644
--- a/chrome/utility/utility_main.cc
+++ b/chrome/utility/utility_main.cc
@@ -14,15 +14,15 @@
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/hi_res_timer_manager.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/utility/utility_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/main_function_params.h"
 #include "ui/base/system_monitor/system_monitor.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/sandbox_init_wrapper.h"
+#include "content/common/sandbox_init_wrapper.h"
 #include "sandbox/src/sandbox.h"
 #endif  // defined(OS_WIN)
 
diff --git a/chrome/worker/worker_main.cc b/chrome/worker/worker_main.cc
index 1c7b831..83bb4a2 100644
--- a/chrome/worker/worker_main.cc
+++ b/chrome/worker/worker_main.cc
@@ -10,13 +10,13 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/hi_res_timer_manager.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/worker/worker_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/main_function_params.h"
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
-#include "chrome/common/sandbox_init_wrapper.h"
+#include "content/common/sandbox_init_wrapper.h"
 #include "sandbox/src/sandbox.h"
 #endif
 
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 32d6214..61822da 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -69,8 +69,8 @@
 #include "chrome/browser/chromeos/plugin_selection_policy.h"
 #endif
 #if defined(OS_MACOSX)
-#include "chrome/common/font_descriptor_mac.h"
-#include "chrome/common/font_loader_mac.h"
+#include "content/common/font_descriptor_mac.h"
+#include "content/common/font_loader_mac.h"
 #endif
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index dfc90ae..8e80144 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/debug_flags.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/result_codes.h"
@@ -36,6 +35,7 @@
 #include "content/browser/worker_host/message_port_service.h"
 #include "content/browser/worker_host/worker_message_filter.h"
 #include "content/browser/worker_host/worker_service.h"
+#include "content/common/debug_flags.h"
 #include "net/base/mime_util.h"
 #include "ipc/ipc_switches.h"
 #include "net/base/registry_controlled_domain.h"
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc
index 4793281..c4f0b32 100644
--- a/content/browser/zygote_main_linux.cc
+++ b/content/browser/zygote_main_linux.cc
@@ -38,13 +38,13 @@
 #include "chrome/common/chrome_descriptors.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/font_config_ipc_linux.h"
-#include "chrome/common/main_function_params.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/process_watcher.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/common/sandbox_methods_linux.h"
 #include "chrome/common/set_process_title.h"
 #include "chrome/common/unix_domain_socket_posix.h"
+#include "content/common/main_function_params.h"
 #include "media/base/media.h"
 #include "seccompsandbox/sandbox.h"
 #include "skia/ext/SkFontHost_fontconfig_control.h"
diff --git a/chrome/common/chrome_application_mac.h b/content/common/chrome_application_mac.h
index 2ea557c..23178ff 100644
--- a/chrome/common/chrome_application_mac.h
+++ b/content/common/chrome_application_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_CHROME_APPLICATION_MAC_H_
-#define CHROME_COMMON_CHROME_APPLICATION_MAC_H_
+#ifndef CONTENT_COMMON_CHROME_APPLICATION_MAC_H_
+#define CONTENT_COMMON_CHROME_APPLICATION_MAC_H_
 #pragma once
 
 #if defined(__OBJC__)
@@ -68,4 +68,4 @@ void RegisterCrApp();
 
 }  // namespace chrome_application_mac
 
-#endif  // CHROME_COMMON_CHROME_APPLICATION_MAC_H_
+#endif  // CONTENT_COMMON_CHROME_APPLICATION_MAC_H_
diff --git a/chrome/common/chrome_application_mac.mm b/content/common/chrome_application_mac.mm
index 3c1b013..e4adb3a 100644
--- a/chrome/common/chrome_application_mac.mm
+++ b/content/common/chrome_application_mac.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#import "chrome/common/chrome_application_mac.h"
+#import "content/common/chrome_application_mac.h"
 
 #include "base/logging.h"
 
diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc
index 89efd67..62529a1 100644
--- a/content/common/content_switches.cc
+++ b/content/common/content_switches.cc
@@ -16,10 +16,19 @@ const char kAllowSandboxDebugging[]         = "allow-sandbox-debugging";
 // Path to the exe to run for the renderer and plugin subprocesses.
 const char kBrowserSubprocessPath[]         = "browser-subprocess-path";
 
+// Disables client-visible 3D APIs, in particular WebGL and Pepper 3D.
+// This is controlled by policy and is kept separate from the other
+// enable/disable switches to avoid accidentally regressing the policy
+// support for controlling access to these APIs.
+const char kDisable3DAPIs[]                 = "disable-3d-apis";
+
 // Disable limits on the number of backing stores. Can prevent blinking for
 // users with many windows/tabs and lots of memory.
 const char kDisableBackingStoreLimit[]      = "disable-backing-store-limit";
 
+// Disable experimental WebGL support.
+const char kDisableExperimentalWebGL[]      = "disable-webgl";
+
 // Disable FileSystem API.
 const char kDisableFileSystem[]             = "disable-file-system";
 
@@ -89,6 +98,9 @@ const char kExperimentalLocationFeatures[]  = "experimental-location-features";
 // Load NPAPI plugins from the specified directory.
 const char kExtraPluginDir[]                = "extra-plugin-dir";
 
+// Causes the process to run as an extension subprocess.
+const char kExtensionProcess[]              = "extension";
+
 // Extra command line options for launching the GPU process (normally used
 // for debugging). Use like renderer-cmd-prefix.
 const char kGpuLauncher[]                   = "gpu-launcher";
@@ -99,6 +111,9 @@ const char kGpuProcess[]                    = "gpu-process";
 // Causes the GPU process to display a dialog on launch.
 const char kGpuStartupDialog[]              = "gpu-startup-dialog";
 
+// Runs WebGL inside the renderer process.
+const char kInProcessWebGL[]                = "in-process-webgl";
+
 // Use LevelDB as back-end for Indexed Database API.
 const char kLevelDBIndexedDatabase[]        = "indexeddb-use-leveldb";
 
@@ -112,12 +127,18 @@ const char kLoggingLevel[]                  = "log-level";
 // Make plugin processes log their sent and received messages to VLOG(1).
 const char kLogPluginMessages[]             = "log-plugin-messages";
 
+// Causes the process to run as a NativeClient loader.
+const char kNaClLoaderProcess[]             = "nacl-loader";
+
 // Don't Sandbox the GPU process, does not affect other sandboxed processes.
 const char kNoGpuSandbox[]                  = "no-gpu-sandbox";
 
 // Don't send HTTP-Referer headers.
 const char kNoReferrers[]                   = "no-referrers";
 
+// Disables the sandbox for all process types that are normally sandboxed.
+const char kNoSandbox[]                     = "no-sandbox";
+
 // Specifies a command that should be used to launch the plugin process.  Useful
 // for running the plugin process through purify or quantify.  Ex:
 //   --plugin-launcher="path\to\purify /Run=yes"
@@ -168,6 +189,9 @@ const char kProcessPerTab[]                 = "process-per-tab";
 // renderer or plugin host.  If it's empty, it's the browser.
 const char kProcessType[]                   = "type";
 
+// Causes the process to run as a profile import subprocess.
+const char kProfileImportProcess[]          = "profile-import";
+
 // Register Pepper plugins (see pepper_plugin_registry.cc for its format).
 const char kRegisterPepperPlugins[]         = "register-pepper-plugins";
 
@@ -187,6 +211,9 @@ const char kRendererStartupDialog[]         = "renderer-startup-dialog";
 // Runs the plugin processes inside the sandbox.
 const char kSafePlugins[]                   = "safe-plugins";
 
+// Causes the process to run as a service process.
+const char kServiceProcess[]                = "service";
+
 // Runs the renderer and plugins in the same process as the browser
 const char kSingleProcess[]                 = "single-process";
 
@@ -207,6 +234,13 @@ const char kUnlimitedQuotaForIndexedDB[]    = "unlimited-quota-for-indexeddb";
 // A string used to override the default user agent with a custom one.
 const char kUserAgent[]                     = "user-agent";
 
+// Causes the process to run as a utility subprocess.
+const char kUtilityProcess[]                = "utility";
+
+// The utility process is sandboxed, with access to one directory. This flag
+// specifies the directory that can be accessed.
+const char kUtilityProcessAllowedDir[]      = "utility-allowed-dir";
+
 // Will add kWaitForDebugger to every child processes. If a value is passed, it
 // will be used as a filter to determine if the child process should have the
 // kWaitForDebugger flag passed on or not.
diff --git a/content/common/content_switches.h b/content/common/content_switches.h
index 1d29799..022f164 100644
--- a/content/common/content_switches.h
+++ b/content/common/content_switches.h
@@ -13,7 +13,9 @@ namespace switches {
 extern const char kAllowFileAccessFromFiles[];
 extern const char kAllowSandboxDebugging[];
 extern const char kBrowserSubprocessPath[];
+extern const char kDisable3DAPIs[];
 extern const char kDisableBackingStoreLimit[];
+extern const char kDisableExperimentalWebGL[];
 extern const char kDisableFileSystem[];
 extern const char kDisableGpuSandbox[];
 extern const char kDisableGpuWatchdog[];
@@ -32,16 +34,22 @@ extern const char kEnableSandboxLogging[];
 extern const char kEnableSeccompSandbox[];
 extern const char kEnableStatsTable[];
 extern const char kExperimentalLocationFeatures[];
+// TODO(jam): this doesn't belong in content.
+extern const char kExtensionProcess[];
 extern const char kExtraPluginDir[];
 extern const char kGpuLauncher[];
 extern const char kGpuProcess[];
 extern const char kGpuStartupDialog[];
+extern const char kInProcessWebGL[];
 extern const char kLevelDBIndexedDatabase[];
 extern const char kLoadPlugin[];
 extern const char kLoggingLevel[];
 extern const char kLogPluginMessages[];
+// TODO(jam): this doesn't belong in content.
+extern const char kNaClLoaderProcess[];
 extern const char kNoGpuSandbox[];
 extern const char kNoReferrers[];
+extern const char kNoSandbox[];
 extern const char kPluginLauncher[];
 extern const char kPluginPath[];
 extern const char kPluginProcess[];
@@ -55,17 +63,23 @@ extern const char kPpapiStartupDialog[];
 extern const char kProcessPerSite[];
 extern const char kProcessPerTab[];
 extern const char kProcessType[];
+// TODO(jam): this doesn't belong in content.
+extern const char kProfileImportProcess[];
 extern const char kRegisterPepperPlugins[];
 extern const char kRendererCmdPrefix[];
 extern const char kRendererCrashTest[];
 extern const char kRendererProcess[];
 extern const char kRendererStartupDialog[];
 extern const char kSafePlugins[];
+// TODO(jam): this doesn't belong in content.
+extern const char kServiceProcess[];
 extern const char kSingleProcess[];
 extern const char kTestSandbox[];
 extern const char kUnlimitedQuotaForFiles[];
 extern const char kUnlimitedQuotaForIndexedDB[];
 extern const char kUserAgent[];
+extern const char kUtilityProcess[];
+extern const char kUtilityProcessAllowedDir[];
 extern const char kWaitForDebuggerChildren[];
 extern const char kWebCoreLogChannels[];
 extern const char kWebWorkerProcessPerCore[];
diff --git a/chrome/common/debug_flags.cc b/content/common/debug_flags.cc
index 31c6c0a..9fcf2f0 100644
--- a/chrome/common/debug_flags.cc
+++ b/content/common/debug_flags.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/debug_flags.h"
+#include "content/common/debug_flags.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
diff --git a/chrome/common/debug_flags.h b/content/common/debug_flags.h
index 2f68aee..0699e4d 100644
--- a/chrome/common/debug_flags.h
+++ b/content/common/debug_flags.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_DEBUG_FLAGS_H__
-#define CHROME_COMMON_DEBUG_FLAGS_H__
+#ifndef CONTENT_COMMON_DEBUG_FLAGS_H_
+#define CONTENT_COMMON_DEBUG_FLAGS_H_
 #pragma once
 
 #include "content/common/child_process_info.h"
@@ -26,4 +26,4 @@ class DebugFlags {
                                 bool is_in_sandbox);
 };
 
-#endif  // CHROME_COMMON_DEBUG_FLAGS_H__
+#endif  // CONTENT_COMMON_DEBUG_FLAGS_H_
diff --git a/chrome/common/font_descriptor_mac.h b/content/common/font_descriptor_mac.h
index 37b963e..91bb338 100644
--- a/chrome/common/font_descriptor_mac.h
+++ b/content/common/font_descriptor_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_FONT_DESCRIPTOR_MAC_H_
-#define CHROME_COMMON_FONT_DESCRIPTOR_MAC_H_
+#ifndef CONTENT_COMMON_FONT_DESCRIPTOR_MAC_H_
+#define CONTENT_COMMON_FONT_DESCRIPTOR_MAC_H_
 #pragma once
 
 #include "base/string16.h"
@@ -30,4 +30,4 @@ struct FontDescriptor {
   float font_point_size;
 };
 
-#endif  // CHROME_COMMON_FONT_DESCRIPTOR_MAC_H_
+#endif  // CONTENT_COMMON_FONT_DESCRIPTOR_MAC_H_
diff --git a/chrome/common/font_descriptor_mac.mm b/content/common/font_descriptor_mac.mm
index 485c215..90c7986 100644
--- a/chrome/common/font_descriptor_mac.mm
+++ b/content/common/font_descriptor_mac.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/font_descriptor_mac.h"
+#include "content/common/font_descriptor_mac.h"
 
 #include <Cocoa/Cocoa.h>
 
diff --git a/chrome/common/font_descriptor_mac_unittest.mm b/content/common/font_descriptor_mac_unittest.mm
index 442e8e2..afa905b 100644
--- a/chrome/common/font_descriptor_mac_unittest.mm
+++ b/content/common/font_descriptor_mac_unittest.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/font_descriptor_mac.h"
+#include "content/common/font_descriptor_mac.h"
 
 #include <Cocoa/Cocoa.h>
 
diff --git a/chrome/common/font_loader_mac.h b/content/common/font_loader_mac.h
index d25ec43..532a09c 100644
--- a/chrome/common/font_loader_mac.h
+++ b/content/common/font_loader_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_FONT_LOADER_MAC_H_
-#define CHROME_COMMON_FONT_LOADER_MAC_H_
+#ifndef CONTENT_COMMON_FONT_LOADER_MAC_H_
+#define CONTENT_COMMON_FONT_LOADER_MAC_H_
 #pragma once
 
 #include <ApplicationServices/ApplicationServices.h>
@@ -52,4 +52,4 @@ class FontLoader {
                                          ATSFontContainerRef* font_container);
 };
 
-#endif // CHROME_COMMON_FONT_LOADER_MAC_H_
+#endif // CONTENT_COMMON_FONT_LOADER_MAC_H_
diff --git a/chrome/common/font_loader_mac.mm b/content/common/font_loader_mac.mm
index b910eb0..124708b 100644
--- a/chrome/common/font_loader_mac.mm
+++ b/content/common/font_loader_mac.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/font_loader_mac.h"
+#include "content/common/font_loader_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/chrome/common/main_function_params.h b/content/common/main_function_params.h
index e4a5fcc..1c53c5f 100644
--- a/chrome/common/main_function_params.h
+++ b/content/common/main_function_params.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,12 +6,12 @@
 // plugin) to shield the call sites from the differences between platforms
 // (e.g., POSIX doesn't need to pass any sandbox information).
 
-#ifndef CHROME_COMMON_MAIN_FUNCTION_PARAMS_H_
-#define CHROME_COMMON_MAIN_FUNCTION_PARAMS_H_
+#ifndef CONTENT_COMMON_MAIN_FUNCTION_PARAMS_H_
+#define CONTENT_COMMON_MAIN_FUNCTION_PARAMS_H_
 #pragma once
 
 #include "base/command_line.h"
-#include "chrome/common/sandbox_init_wrapper.h"
+#include "content/common/sandbox_init_wrapper.h"
 
 namespace base {
 namespace mac {
@@ -34,4 +34,4 @@ struct MainFunctionParams {
   Task* ui_task;
 };
 
-#endif  // CHROME_COMMON_MAIN_FUNCTION_PARAMS_H_
+#endif  // CONTENT_COMMON_MAIN_FUNCTION_PARAMS_H_
diff --git a/chrome/common/sandbox_init_wrapper.h b/content/common/sandbox_init_wrapper.h
index 3c70a7a..c144992 100644
--- a/chrome/common/sandbox_init_wrapper.h
+++ b/content/common/sandbox_init_wrapper.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_SANDBOX_INIT_WRAPPER_H_
-#define CHROME_COMMON_SANDBOX_INIT_WRAPPER_H_
+#ifndef CONTENT_COMMON_SANDBOX_INIT_WRAPPER_H_
+#define CONTENT_COMMON_SANDBOX_INIT_WRAPPER_H_
 #pragma once
 
 // Wraps the sandbox initialization and platform variables to consolodate
@@ -67,4 +67,4 @@ class SandboxInitWrapper {
 
 #endif
 
-#endif  // CHROME_COMMON_SANDBOX_INIT_WRAPPER_H_
+#endif  // CONTENT_COMMON_SANDBOX_INIT_WRAPPER_H_
diff --git a/chrome/common/sandbox_init_wrapper_linux.cc b/content/common/sandbox_init_wrapper_linux.cc
index ffb711d..450bd2d 100644
--- a/chrome/common/sandbox_init_wrapper_linux.cc
+++ b/content/common/sandbox_init_wrapper_linux.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/sandbox_init_wrapper.h"
+#include "content/common/sandbox_init_wrapper.h"
 
 #include "base/command_line.h"
 
diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/content/common/sandbox_init_wrapper_mac.cc
index b9cfa50..997ba43 100644
--- a/chrome/common/sandbox_init_wrapper_mac.cc
+++ b/content/common/sandbox_init_wrapper_mac.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/sandbox_init_wrapper.h"
+#include "content/common/sandbox_init_wrapper.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/sandbox_mac.h"
+#include "content/common/content_switches.h"
+#include "content/common/sandbox_mac.h"
 
 bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
                                            const std::string& process_type) {
diff --git a/chrome/common/sandbox_init_wrapper_win.cc b/content/common/sandbox_init_wrapper_win.cc
index ec9ef54..d322130 100644
--- a/chrome/common/sandbox_init_wrapper_win.cc
+++ b/content/common/sandbox_init_wrapper_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 "chrome/common/sandbox_init_wrapper.h"
+#include "content/common/sandbox_init_wrapper.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
diff --git a/chrome/common/sandbox_mac.h b/content/common/sandbox_mac.h
index e81f72e..50c989b 100644
--- a/chrome/common/sandbox_mac.h
+++ b/content/common/sandbox_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_SANDBOX_MAC_H_
-#define CHROME_COMMON_SANDBOX_MAC_H_
+#ifndef CONTENT_COMMON_SANDBOX_MAC_H_
+#define CONTENT_COMMON_SANDBOX_MAC_H_
 #pragma once
 
 #include <string>
@@ -177,4 +177,4 @@ class Sandbox {
 
 }  // namespace sandbox
 
-#endif  // CHROME_COMMON_SANDBOX_MAC_H_
+#endif  // CONTENT_COMMON_SANDBOX_MAC_H_
diff --git a/chrome/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index 0ae572c..1d1d36f 100644
--- a/chrome/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/sandbox_mac.h"
+#include "content/common/sandbox_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #import <OpenGL/OpenGL.h>
@@ -26,8 +26,8 @@ extern "C" {
 #include "base/sys_info.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/chrome_application_mac.h"
-#include "chrome/common/chrome_switches.h"
+#include "content/common/chrome_application_mac.h"
+#include "content/common/content_switches.h"
 #include "unicode/uchar.h"
 
 namespace {
diff --git a/chrome/common/sandbox_mac_diraccess_unittest.mm b/content/common/sandbox_mac_diraccess_unittest.mm
index fed540d..8aad63b 100644
--- a/chrome/common/sandbox_mac_diraccess_unittest.mm
+++ b/content/common/sandbox_mac_diraccess_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -14,7 +14,7 @@ extern "C" {
 #include "base/test/multiprocess_test.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/sandbox_mac.h"
+#include "content/common/sandbox_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
diff --git a/chrome/common/sandbox_mac_fontloading_unittest.mm b/content/common/sandbox_mac_fontloading_unittest.mm
index 17f4a4a..7df1bfe 100644
--- a/chrome/common/sandbox_mac_fontloading_unittest.mm
+++ b/content/common/sandbox_mac_fontloading_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,8 +9,8 @@
 #include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
-#include "chrome/common/font_loader_mac.h"
-#include "chrome/common/sandbox_mac_unittest_helper.h"
+#include "content/common/font_loader_mac.h"
+#include "content/common/sandbox_mac_unittest_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/chrome/common/sandbox_mac_system_access_unittest.mm b/content/common/sandbox_mac_system_access_unittest.mm
index 382aa2c..46d7596 100644
--- a/chrome/common/sandbox_mac_system_access_unittest.mm
+++ b/content/common/sandbox_mac_system_access_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/common/sandbox_mac.h"
-#include "chrome/common/sandbox_mac_unittest_helper.h"
+#include "content/common/sandbox_mac.h"
+#include "content/common/sandbox_mac_unittest_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/chrome/common/sandbox_mac_unittest_helper.h b/content/common/sandbox_mac_unittest_helper.h
index ace4767..f228678 100644
--- a/chrome/common/sandbox_mac_unittest_helper.h
+++ b/content/common/sandbox_mac_unittest_helper.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_
-#define CHROME_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_
+#ifndef CONTENT_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_
+#define CONTENT_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_
 #pragma once
 
 #include "base/test/multiprocess_test.h"
-#include "chrome/common/sandbox_mac.h"
+#include "content/common/sandbox_mac.h"
 
 namespace sandboxtest {
 
@@ -114,4 +114,4 @@ template <class T> struct RegisterSandboxTest {
 
 }  // namespace sandboxtest
 
-#endif  // CHROME_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_
+#endif  // CONTENT_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_
diff --git a/chrome/common/sandbox_mac_unittest_helper.mm b/content/common/sandbox_mac_unittest_helper.mm
index e437289..6b485de 100644
--- a/chrome/common/sandbox_mac_unittest_helper.mm
+++ b/content/common/sandbox_mac_unittest_helper.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/sandbox_mac_unittest_helper.h"
+#include "content/common/sandbox_mac_unittest_helper.h"
 
 extern "C" {
 #include <sandbox.h>
@@ -13,7 +13,7 @@ extern "C" {
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/sandbox_mac.h"
+#include "content/common/sandbox_mac.h"
 #include "testing/multiprocess_func_list.h"
 
 using sandbox::Sandbox;
diff --git a/content/content_common.gypi b/content/content_common.gypi
index fa83cf9..cd62bd3 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -9,6 +9,7 @@
       'type': '<(library)',
       'dependencies': [
         '../ipc/ipc.gyp:ipc',
+        '../third_party/icu/icu.gyp:icuuc',
         '../webkit/support/webkit_support.gyp:fileapi',
       ],
       'include_dirs': [
@@ -24,6 +25,8 @@
         'common/child_process_messages.h',
         'common/child_thread.cc',
         'common/child_thread.h',
+        'common/chrome_application_mac.h',
+        'common/chrome_application_mac.mm',
         'common/common_param_traits.cc',
         'common/common_param_traits.h',
         'common/content_message_generator.cc',
@@ -36,6 +39,8 @@
         'common/content_paths.h',
         'common/content_switches.cc',
         'common/content_switches.h',
+        'common/debug_flags.cc',
+        'common/debug_flags.h',
         'common/dx_diag_node.cc',
         'common/dx_diag_node.h',
         'common/file_system/file_system_dispatcher.cc',
@@ -47,9 +52,14 @@
         'common/file_system/webfilewriter_impl.cc',
         'common/file_system/webfilewriter_impl.h',
         'common/file_system_messages.h',
+        'common/font_descriptor_mac.h',
+        'common/font_descriptor_mac.mm',
+        'common/font_loader_mac.h',
+        'common/font_loader_mac.mm',
         'common/gpu_info.cc',
         'common/gpu_info.h',
         'common/gpu_messages.h',
+        'common/main_function_params.h',          
         'common/message_router.cc',
         'common/message_router.h',
         'common/notification_details.cc',
@@ -72,6 +82,12 @@
         'common/resource_messages.h',
         'common/resource_response.cc',
         'common/resource_response.h',
+        'common/sandbox_init_wrapper.h',
+        'common/sandbox_init_wrapper_linux.cc',
+        'common/sandbox_init_wrapper_mac.cc',
+        'common/sandbox_init_wrapper_win.cc',
+        'common/sandbox_mac.h',
+        'common/sandbox_mac.mm',
         'common/socket_stream.h',
         'common/socket_stream_dispatcher.cc',
         'common/socket_stream_dispatcher.h',