BASELINE: Update chromium to 44.0.2403.47

Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

14 files changed, 2098 insertions, 1203 deletions

diff --git a/chromium/extensions/browser/extension_function_histogram_value.h b/chromium/extensions/browser/extension_function_histogram_value.h
index ab43f9002f3..8a7081c0e55 100644
--- a/chromium/extensions/browser/extension_function_histogram_value.h
+++ b/chromium/extensions/browser/extension_function_histogram_value.h
@@ -134,7 +134,7 @@ enum HistogramValue {
   DELETED_SERIAL_GETPORTS,
   DELETED_FILEMANAGERPRIVATE_CLEARDRIVECACHE,
   SERIAL_GETCONTROLSIGNALS,
-  DEVELOPERPRIVATE_ENABLE,
+  DELETED_DEVELOPERPRIVATE_ENABLE,
   FILEMANAGERPRIVATE_GETENTRYPROPERTIES,
   USB_FINDDEVICES,
   BOOKMARKMANAGERPRIVATE_DROP,
@@ -166,7 +166,7 @@ enum HistogramValue {
   TERMINALPRIVATE_OPENTERMINALPROCESS,
   DELETED_SERIAL_CLOSE,
   CONTEXTMENUS_REMOVE,
-  FILEMANAGERPRIVATE_REQUESTFILESYSTEM,
+  FILESYSTEM_REQUESTFILESYSTEM,
   ECHOPRIVATE_GETREGISTRATIONCODE,
   TABS_GETCURRENT,
   FONTSETTINGS_CLEARDEFAULTFIXEDFONTSIZE,
@@ -331,7 +331,7 @@ enum HistogramValue {
   WALLPAPERPRIVATE_GETOFFLINEWALLPAPERLIST,
   BROWSERACTION_GETBADGEBACKGROUNDCOLOR,
   DELETED_PAGEACTIONS_DISABLEFORTAB,
-  DEVELOPERPRIVATE_ALLOWFILEACCESS,
+  DELETED_DEVELOPERPRIVATE_ALLOWFILEACCESS,
   FILEMANAGERPRIVATE_REMOVEMOUNT,
   DELETED_BLUETOOTH_CONNECT,
   TABCAPTURE_CAPTURE,
@@ -453,8 +453,8 @@ enum HistogramValue {
   FILEMANAGERPRIVATE_GETSIZESTATS,
   DOWNLOADS_RESUME,
   COOKIES_GETALLCOOKIESTORES,
-  MEDIAGALLERIESPRIVATE_ADDGALLERYWATCH,
-  MEDIAGALLERIESPRIVATE_REMOVEGALLERYWATCH,
+  DELETED_MEDIAGALLERIESPRIVATE_ADDGALLERYWATCH,
+  DELETED_MEDIAGALLERIESPRIVATE_REMOVEGALLERYWATCH,
   DELETED_WEBVIEW_EXECUTESCRIPT,
   NOTIFICATIONS_UPDATE,
   NOTIFICATIONS_CLEAR,
@@ -469,8 +469,8 @@ enum HistogramValue {
   NETWORKINGPRIVATE_GETVISIBLENETWORKS,
   NETWORKINGPRIVATE_STARTCONNECT,
   NETWORKINGPRIVATE_STARTDISCONNECT,
-  MEDIAGALLERIESPRIVATE_GETALLGALLERYWATCH,
-  MEDIAGALLERIESPRIVATE_REMOVEALLGALLERYWATCH,
+  DELETED_MEDIAGALLERIESPRIVATE_GETALLGALLERYWATCH,
+  DELETED_MEDIAGALLERIESPRIVATE_REMOVEALLGALLERYWATCH,
   FILEMANAGERPRIVATE_SEARCHDRIVEMETADATA,
   DELETED_ECHOPRIVATE_CHECKALLOWREDEEMOFFERS,
   DELETED_MEDIAGALLERIESPRIVATE_EJECTDEVICE,
@@ -481,7 +481,7 @@ enum HistogramValue {
   NETWORKINGPRIVATE_VERIFYANDENCRYPTCREDENTIALS,
   NETWORKINGPRIVATE_VERIFYANDENCRYPTDATA,
   DEVELOPERPRIVATE_RESTART,
-  DEVELOPERPRIVATE_ALLOWINCOGNITO,
+  DELETED_DEVELOPERPRIVATE_ALLOWINCOGNITO,
   INPUT_IME_DELETESURROUNDINGTEXT,
   DELETED_FILEMANAGERPRIVATE_OPENNEWWINDOW,
   CLOUDPRINTPRIVATE_GETCLIENTID,
@@ -727,7 +727,7 @@ enum HistogramValue {
   LOGPRIVATE_STARTNETINTERNALSWATCH,
   LOGPRIVATE_STOPNETINTERNALSWATCH,
   FILEMANAGERPRIVATE_GETPROFILES,
-  FILEMANAGERPRIVATE_VISITDESKTOP,
+  DELETED_FILEMANAGERPRIVATE_VISITDESKTOP,
   VIRTUALKEYBOARDPRIVATE_GETKEYBOARDCONFIG,
   HID_GETDEVICES,
   HID_CONNECT,
@@ -738,8 +738,8 @@ enum HistogramValue {
   HID_SENDFEATUREREPORT,
   HOTWORDPRIVATE_SETENABLED,
   HOTWORDPRIVATE_GETSTATUS,
-  APP_CURRENTWINDOWINTERNAL_SETBADGEICON,
-  APP_CURRENTWINDOWINTERNAL_CLEARBADGE,
+  DELETED_APP_CURRENTWINDOWINTERNAL_SETBADGEICON,
+  DELETED_APP_CURRENTWINDOWINTERNAL_CLEARBADGE,
   DELETED_WEBVIEW_SETZOOM,
   DELETED_WEBVIEW_GETZOOM,
   DEVELOPERPRIVATE_REQUESTFILESOURCE,
@@ -825,9 +825,9 @@ enum HistogramValue {
   DELETED_FILESYSTEMPROVIDERINTERNAL_OPENFILEREQUESTEDERROR,
   DELETED_FILESYSTEMPROVIDERINTERNAL_CLOSEFILEREQUESTEDSUCCESS,
   DELETED_FILESYSTEMPROVIDERINTERNAL_CLOSEFILEREQUESTEDERROR,
-  SYNCEDNOTIFICATIONSPRIVATE_GETINITIALDATA,
-  SYNCEDNOTIFICATIONSPRIVATE_UPDATENOTIFICATION,
-  SYNCEDNOTIFICATIONSPRIVATE_SETRENDERCONTEXT,
+  DELETED_SYNCEDNOTIFICATIONSPRIVATE_GETINITIALDATA,
+  DELETED_SYNCEDNOTIFICATIONSPRIVATE_UPDATENOTIFICATION,
+  DELETED_SYNCEDNOTIFICATIONSPRIVATE_SETRENDERCONTEXT,
   IDENTITY_GETACCOUNTS,
   FILEMANAGERPRIVATE_RESOLVEISOLATEDENTRIES,
   FILESYSTEMPROVIDERINTERNAL_READFILEREQUESTEDSUCCESS,
@@ -835,7 +835,7 @@ enum HistogramValue {
   NETWORKINGPRIVATE_GETNETWORKS,
   DELETED_WEBVIEW_SETNAME,
   ENTERPRISE_PLATFORMKEYSINTERNAL_GENERATEKEY,
-  ENTERPRISE_PLATFORMKEYSINTERNAL_SIGN,
+  PLATFORMKEYSINTERNAL_SIGN,
   ENTERPRISE_PLATFORMKEYSINTERNAL_GETTOKENS,
   ENTERPRISE_PLATFORMKEYS_GETCERTIFICATES,
   ENTERPRISE_PLATFORMKEYS_IMPORTCERTIFICATE,
@@ -959,10 +959,10 @@ enum HistogramValue {
   HOTWORDPRIVATE_SETHOTWORDALWAYSONSEARCHENABLED,
   WEBVIEWINTERNAL_LOADDATAWITHBASEURL,
   GUESTVIEWINTERNAL_DESTROYGUEST,
-  COPRESENCESOCKET_CREATEPEER,
-  COPRESENCESOCKET_DESTROYPEER,
-  COPRESENCESOCKET_SEND,
-  COPRESENCESOCKET_DISCONNECT,
+  DELETED_COPRESENCESOCKET_CREATEPEER,
+  DELETED_COPRESENCESOCKET_DESTROYPEER,
+  DELETED_COPRESENCESOCKET_SEND,
+  DELETED_COPRESENCESOCKET_DISCONNECT,
   BOOKMARKMANAGERPRIVATE_SETVERSION,
   FILESYSTEMPROVIDER_NOTIFY,
   USB_GETUSERSELECTEDDEVICES,
@@ -980,7 +980,125 @@ enum HistogramValue {
   VPNPROVIDER_SENDPACKET,
   VPNPROVIDER_NOTIFYCONNECTIONSTATECHANGED,
   DOCUMENT_SCAN_SCAN,
-  EASYUNLOCKPRIVATE_GETUSERIMAGE,
+  DELETED_EASYUNLOCKPRIVATE_GETUSERIMAGE,
+  HOTWORDPRIVATE_NOTIFYSPEAKERMODELSAVED,
+  HOTWORDPRIVATE_GETLOCALIZEDSTRINGS,
+  HOTWORDPRIVATE_SETAUDIOHISTORYENABLED,
+  HOTWORDPRIVATE_GETAUDIOHISTORYENABLED,
+  APP_CURRENTWINDOWINTERNAL_SETINTERCEPTALLKEYS,
+  LAUNCHERPAGE_PUSHSUBPAGE,
+  LAUNCHERPAGE_SHOW,
+  AUTOTESTPRIVATE_SETTOUCHPADSENSITIVITY,
+  AUTOTESTPRIVATE_SETTAPTOCLICK,
+  AUTOTESTPRIVATE_SETTHREEFINGERCLICK,
+  AUTOTESTPRIVATE_SETTAPDRAGGING,
+  AUTOTESTPRIVATE_SETNATURALSCROLL,
+  AUTOTESTPRIVATE_SETMOUSESENSITIVITY,
+  AUTOTESTPRIVATE_SETPRIMARYBUTTONRIGHT,
+  DELETED_COPRESENCEENDPOINTS_CREATELOCALENDPOINT,
+  DELETED_COPRESENCEENDPOINTS_DESTROYLOCALENDPOINT,
+  DELETED_COPRESENCEENDPOINTS_SEND,
+  INLINE_INSTALL_PRIVATE_INSTALL,
+  LAUNCHERPAGE_SETENABLED,
+  DELETED_CRYPTOTOKENPRIVATE_REQUESTPERMISSION,
+  BLUETOOTHPRIVATE_DISCONNECTALL,
+  FILEMANAGERPRIVATE_GETMIMETYPE,
+  USB_SETCONFIGURATION,
+  EASYUNLOCKPRIVATE_GETCONNECTIONINFO,
+  FILEMANAGERPRIVATE_COMPUTECHECKSUM,
+  PRINTERPROVIDERINTERNAL_REPORTPRINTRESULT,
+  PRINTERPROVIDERINTERNAL_REPORTPRINTERCAPABILITY,
+  PRINTERPROVIDERINTERNAL_REPORTPRINTERS,
+  FILESYSTEMPROVIDER_GET,
+  FILEMANAGERPRIVATE_SEARCHFILESBYHASHES,
+  EASYUNLOCKPRIVATE_SHOWERRORBUBBLE,
+  EXTENSIONVIEWINTERNAL_NAVIGATE,
+  NETWORKING_CONFIG_SETNETWORKFILTER,
+  NETWORKING_CONFIG_FINISHAUTHENTICATION,
+  PLATFORMKEYSINTERNAL_SELECTCLIENTCERTIFICATES,
+  CRYPTOTOKENPRIVATE_CANORIGINASSERTAPPID,
+  EASYUNLOCKPRIVATE_SETAUTOPAIRINGRESULT,
+  FILEMANAGERPRIVATE_ISUMAENABLED,
+  WEBVIEWINTERNAL_SETALLOWSCALING,
+  PLATFORMKEYSINTERNAL_GETPUBLICKEY,
+  RUNTIME_OPENOPTIONSPAGE,
+  AUDIOMODEM_TRANSMIT,
+  AUDIOMODEM_STOPTRANSMIT,
+  AUDIOMODEM_RECEIVE,
+  AUDIOMODEM_STOPRECEIVE,
+  WEBRTCLOGGINGPRIVATE_STORE,
+  WEBRTCLOGGINGPRIVATE_UPLOADSTORED,
+  FILEMANAGERPRIVATE_SETENTRYTAG,
+  INPUTMETHODPRIVATE_FETCHALLDICTIONARYWORDS,
+  INPUTMETHODPRIVATE_ADDWORDTODICTIONARY,
+  WEBSTOREPRIVATE_SHOWPERMISSIONPROMPTFORDELEGATEDINSTALL,
+  PRINTERPROVIDERINTERNAL_GETPRINTDATA,
+  VIRTUALKEYBOARDPRIVATE_SETMODE,
+  NETWORKINGPRIVATE_STARTACTIVATE,
+  FILEMANAGERPRIVATE_GRANTACCESS,
+  DEVELOPERPRIVATE_GETEXTENSIONSINFO,
+  DEVELOPERPRIVATE_GETEXTENSIONINFO,
+  FILEMANAGERPRIVATE_ENABLEEXTERNALFILESCHEME,
+  DEVELOPERPRIVATE_UPDATEEXTENSIONCONFIGURATION,
+  DEVELOPERPRIVATE_DELETEEXTENSIONERRORS,
+  FILEMANAGERPRIVATE_ISPIEXLOADERENABLED,
+  HOTWORDPRIVATE_SPEAKERMODELEXISTSRESULT,
+  SETTINGSPRIVATE_SETPREF,
+  DELETED_SETTINGSPRIVATE_SETDOUBLEPREF,
+  DELETED_SETTINGSPRIVATE_SETSTRINGPREF,
+  DELETED_SETTINGSPRIVATE_SETURLPREF,
+  SETTINGSPRIVATE_GETALLPREFS,
+  SETTINGSPRIVATE_GETPREF,
+  NETWORKINGPRIVATE_FORGETNETWORK,
+  EASYUNLOCKPRIVATE_HIDEERRORBUBBLE,
+  WEBVIEWINTERNAL_SETZOOMMODE,
+  WEBVIEWINTERNAL_GETZOOMMODE,
+  LAUNCHERSEARCHPROVIDER_SETSEARCHRESULTS,
+  DATAREDUCTIONPROXY_CLEARDATASAVINGS,
+  BLUETOOTHPRIVATE_SETDISCOVERYFILTER,
+  FILESYSTEM_GETVOLUMELIST,
+  NETWORKINGPRIVATE_GETDEVICESTATES,
+  DEVELOPERPRIVATE_GETPROFILECONFIGURATION,
+  DEVELOPERPRIVATE_UPDATEPROFILECONFIGURATION,
+  SOCKETS_UDP_SETBROADCAST,
+  FILEMANAGERPRIVATE_GETPROVIDINGEXTENSIONS,
+  WEBVIEWINTERNAL_ADDCONTENTSCRIPTS,
+  WEBVIEWINTERNAL_REMOVECONTENTSCRIPTS,
+  DEVELOPERPRIVATE_REPAIREXTENSION,
+  DEVELOPERPRIVATE_SHOWOPTIONS,
+  DEVELOPERPRIVATE_SHOWPATH,
+  FILEMANAGERPRIVATE_ADDPROVIDEDFILESYSTEM,
+  FILEMANAGERPRIVATE_CONFIGUREVOLUME,
+  SEARCHENGINESPRIVATE_GETSEARCHENGINES,
+  SEARCHENGINESPRIVATE_SETSELECTEDSEARCHENGINE,
+  AUTOFILLPRIVATE_SAVEADDRESS,
+  AUTOFILLPRIVATE_GETADDRESSCOMPONENTS,
+  AUTOFILLPRIVATE_SAVECREDITCARD,
+  AUTOFILLPRIVATE_REMOVEENTRY,
+  AUTOFILLPRIVATE_VALIDATEPHONENUMBERS,
+  AUTOFILLPRIVATE_MASKCREDITCARD,
+  INSTANCEID_GETID,
+  INSTANCEID_GETCREATIONTIME,
+  INSTANCEID_GETTOKEN,
+  INSTANCEID_DELETETOKEN,
+  INSTANCEID_DELETEID,
+  GCDPRIVATE_GETDEVICEINFO,
+  SEARCHENGINESPRIVATE_GETHOTWORDSTATE,
+  SEARCHENGINESPRIVATE_ADDOTHERSEARCHENGINE,
+  SEARCHENGINESPRIVATE_REMOVESEARCHENGINE,
+  SEARCHENGINESPRIVATE_UPDATESEARCHENGINE,
+  SEARCHENGINESPRIVATE_OPTINTOHOTWORDING,
+  WEBSTOREWIDGETPRIVATE_INSTALLWEBSTOREITEM,
+  WEBSTOREWIDGETPRIVATE_GETSTRINGS,
+  WEBRTCDESKTOPCAPTUREPRIVATE_CHOOSEDESKTOPMEDIA,
+  WEBRTCDESKTOPCAPTUREPRIVATE_CANCELCHOOSEDESKTOPMEDIA,
+  BLUETOOTHLOWENERGY_REGISTERADVERTISEMENT,
+  BLUETOOTHLOWENERGY_UNREGISTERADVERTISEMENT,
+  PASSWORDSPRIVATE_CANPASSWORDACCOUNTBEMANAGED,
+  PASSWORDSPRIVATE_REMOVESAVEDPASSWORD,
+  PASSWORDSPRIVATE_REMOVEPASSWORDEXCEPTION,
+  PASSWORDSPRIVATE_GETPLAINTEXTPASSWORD,
+  LAUNCHERPAGE_HIDE,
   // Last entry: Add new entries above and ensure to update
   // tools/metrics/histograms/histograms.xml.
   ENUM_BOUNDARY
diff --git a/chromium/extensions/browser/extension_function_registry.h b/chromium/extensions/browser/extension_function_registry.h
index 211a899cb94..a0812737a91 100644
--- a/chromium/extensions/browser/extension_function_registry.h
+++ b/chromium/extensions/browser/extension_function_registry.h
@@ -45,7 +45,7 @@ class ExtensionFunctionRegistry {
   void RegisterFunction() {
     ExtensionFunctionFactory factory = &NewExtensionFunction<T>;
     factories_[T::function_name()] =
-        FactoryEntry(factory, T::histogram_value());
+        FactoryEntry(factory, T::function_name(), T::histogram_value());
   }
 
   struct FactoryEntry {
@@ -53,9 +53,11 @@ class ExtensionFunctionRegistry {
     explicit FactoryEntry();
     explicit FactoryEntry(
         ExtensionFunctionFactory factory,
+        const char* function_name,
         extensions::functions::HistogramValue histogram_value);
 
     ExtensionFunctionFactory factory_;
+    const char* function_name_;
     extensions::functions::HistogramValue histogram_value_;
   };
 
diff --git a/chromium/extensions/common/api/api.gyp b/chromium/extensions/common/api/api.gyp
index e9d07deddf4..ea7e4c19530 100644
--- a/chromium/extensions/common/api/api.gyp
+++ b/chromium/extensions/common/api/api.gyp
@@ -5,6 +5,20 @@
 {
   'targets': [
     {
+      # GN version: //extensions/common/api:mojom
+      'target_name': 'extensions_api_mojom',
+      # The type of this target must be none. This is so that resources can
+      # depend upon this target for generating the js bindings files. Any
+      # generated cpp files must be listed explicitly in chrome_api.
+      'type': 'none',
+      'includes': [
+        '../../../third_party/mojo/mojom_bindings_generator.gypi',
+      ],
+      'sources': [
+        'mime_handler.mojom',
+      ],
+    },
+    {
       # GN version: //extensions/common/api
       'target_name': 'extensions_api',
       'type': 'static_library',
@@ -15,6 +29,14 @@
         '../../../build/json_schema_compile.gypi',
         'schemas.gypi',
       ],
+      'dependencies': [
+        'extensions_api_mojom',
+        '../../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+      ],
+      'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/extensions/common/api/mime_handler.mojom.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/extensions/common/api/mime_handler.mojom.h',
+      ],
     },
     {
       # Protobuf compiler / generator for chrome.cast.channel-related protocol buffers.
diff --git a/chromium/extensions/common/api/schemas.gypi b/chromium/extensions/common/api/schemas.gypi
index c225beb5b78..38f5e8cf7d3 100644
--- a/chromium/extensions/common/api/schemas.gypi
+++ b/chromium/extensions/common/api/schemas.gypi
@@ -9,26 +9,35 @@
   'variables': {
     'chromium_code': 1,
     'schema_files': [
+      'alarms.idl',
       'app_current_window_internal.idl',
       'app_runtime.idl',
       'app_view_guest_internal.json',
       'app_window.idl',
+      'audio.idl',
       'bluetooth.idl',
       'bluetooth_low_energy.idl',
       'bluetooth_private.json',
       'bluetooth_socket.idl',
       'cast_channel.idl',
-      'copresence_socket.idl',
+      'document_scan.idl',
       'dns.idl',
       'events.json',
       'extensions_manifest_types.json',
       'extension_options_internal.idl',
+      'extension_view_internal.json',
       'extension_types.json',
       'guest_view_internal.json',
       'management.json',
       'hid.idl',
+      'idle.json',
+      'mime_handler_private.idl',
       'mime_handler_view_guest_internal.json',
+      'mojo_private.idl',
+      'networking_private.idl',
       'power.idl',
+      'printer_provider.idl',
+      'printer_provider_internal.idl',
       'runtime.json',
       'serial.idl',
       'socket.idl',
@@ -36,6 +45,7 @@
       'sockets_tcp_server.idl',
       'sockets_udp.idl',
       'storage.json',
+      'surface_worker_internal.json',
       'system_cpu.idl',
       'system_display.idl',
       'system_memory.idl',
@@ -44,12 +54,14 @@
       'test.json',
       'usb.idl',
       'virtual_keyboard_private.json',
-      'vpn_provider.idl',
       'web_request.json',
-      'web_view_internal.json',
+      'web_view_internal.json'
     ],
     # ChromeOS-specific schemas.
     'chromeos_schema_files': [
+      'diagnostics.idl',
+      'networking_config.idl',
+      'vpn_provider.idl',
       'webcam_private.idl',
     ],
     'non_compiled_schema_files': [
diff --git a/chromium/extensions/components/javascript_dialog_extensions_client.gypi b/chromium/extensions/components/javascript_dialog_extensions_client.gypi
index 40d10298341..611108fbada 100644
--- a/chromium/extensions/components/javascript_dialog_extensions_client.gypi
+++ b/chromium/extensions/components/javascript_dialog_extensions_client.gypi
@@ -7,7 +7,7 @@
       'target_name': 'javascript_dialog_extensions_client',
       'type': 'static_library',
       'dependencies': [
-        '../../components/components.gyp:app_modal_dialogs',
+        '../../components/components.gyp:app_modal',
         '../../skia/skia.gyp:skia',
         '../extensions.gyp:extensions_browser',
         '../extensions.gyp:extensions_common',
diff --git a/chromium/extensions/extensions.gyp b/chromium/extensions/extensions.gyp
index b4c26803ae0..b42c94488f7 100644
--- a/chromium/extensions/extensions.gyp
+++ b/chromium/extensions/extensions.gyp
@@ -3,26 +3,14 @@
 # found in the LICENSE file.
 
 {
+  'includes': [
+    'extensions.gypi',
+  ],
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
-      # GN version: //extensions/common:mojo
-      'target_name': 'extensions_common_mojo',
-      # The type of this target must be none. This is so that resources can
-      # depend upon this target for generating the js bindings files. Any
-      # generated cpp files must be listed explicitly in extensions_common
-      'type': 'none',
-      'includes': [
-        '../mojo/public/tools/bindings/mojom_bindings_generator.gypi',
-      ],
-      'sources': [
-        'common/mojo/keep_alive.mojom',
-        'common/mojo/stash.mojom',
-      ],
-    },
-    {
       # GN version: //extensions/common
       'target_name': 'extensions_common_constants',
       'type': 'static_library',
@@ -31,14 +19,26 @@
         '<(INTERMEDIATE_DIR)',
       ],
       'sources': [
-        # Note: sources list duplicated in GN build.
-        'common/constants.cc',
-        'common/constants.h',
+        '<@(extensions_common_constants_sources)',
       ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
+      # GN version: //extensions/common:mojo
+      'target_name': 'extensions_common_mojo',
+      # The type of this target must be none. This is so that resources can
+      # depend upon this target for generating the js bindings files. Any
+      # generated cpp files must be listed explicitly in extensions_common
+      'type': 'none',
+      'includes': [
+        '../third_party/mojo/mojom_bindings_generator.gypi',
+      ],
+      'sources': [
+        '<@(extensions_common_mojo_sources)',
+      ],
+    },
+    {
       # GN version: //extensions/common
       'target_name': 'extensions_common',
       'type': 'static_library',
@@ -53,6 +53,7 @@
         '../device/usb/usb.gyp:device_usb',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/re2/re2.gyp:re2',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/gfx/gfx.gyp:gfx_geometry',
@@ -70,191 +71,10 @@
         '<(INTERMEDIATE_DIR)',
       ],
       'sources': [
-        # Note: sources list duplicated in GN build.
-        'common/api/bluetooth/bluetooth_manifest_data.cc',
-        'common/api/bluetooth/bluetooth_manifest_data.h',
-        'common/api/bluetooth/bluetooth_manifest_handler.cc',
-        'common/api/bluetooth/bluetooth_manifest_handler.h',
-        'common/api/bluetooth/bluetooth_manifest_permission.cc',
-        'common/api/bluetooth/bluetooth_manifest_permission.h',
-        'common/api/messaging/message.h',
-        'common/api/sockets/sockets_manifest_data.cc',
-        'common/api/sockets/sockets_manifest_data.h',
-        'common/api/sockets/sockets_manifest_handler.cc',
-        'common/api/sockets/sockets_manifest_handler.h',
-        'common/api/sockets/sockets_manifest_permission.cc',
-        'common/api/sockets/sockets_manifest_permission.h',
-        'common/common_manifest_handlers.cc',
-        'common/common_manifest_handlers.h',
-        'common/csp_validator.cc',
-        'common/csp_validator.h',
-        'common/dom_action_types.h',
-        'common/draggable_region.cc',
-        'common/draggable_region.h',
-        'common/error_utils.cc',
-        'common/error_utils.h',
-        'common/event_filter.cc',
-        'common/event_filter.h',
-        'common/event_filtering_info.cc',
-        'common/event_filtering_info.h',
-        'common/event_matcher.cc',
-        'common/event_matcher.h',
-        'common/extension.cc',
-        'common/extension.h',
-        'common/extension_api.cc',
-        'common/extension_api.h',
-        'common/extension_icon_set.cc',
-        'common/extension_icon_set.h',
-        'common/extension_l10n_util.cc',
-        'common/extension_l10n_util.h',
-        'common/extension_message_generator.cc',
-        'common/extension_message_generator.h',
-        'common/extension_messages.cc',
-        'common/extension_messages.h',
-        'common/extension_paths.cc',
-        'common/extension_paths.h',
-        'common/extension_resource.cc',
-        'common/extension_resource.h',
-        'common/extension_set.cc',
-        'common/extension_set.h',
-        'common/extension_urls.cc',
-        'common/extension_urls.h',
-        'common/extension_utility_messages.h',
-        'common/extensions_client.cc',
-        'common/extensions_client.h',
-        'common/feature_switch.cc',
-        'common/feature_switch.h',
-        'common/features/api_feature.cc',
-        'common/features/api_feature.h',
-        'common/features/base_feature_provider.cc',
-        'common/features/base_feature_provider.h',
-        'common/features/complex_feature.cc',
-        'common/features/complex_feature.h',
-        'common/features/feature.cc',
-        'common/features/feature.h',
-        'common/features/feature_provider.cc',
-        'common/features/feature_provider.h',
-        'common/features/json_feature_provider_source.cc',
-        'common/features/json_feature_provider_source.h',
-        'common/features/manifest_feature.cc',
-        'common/features/manifest_feature.h',
-        'common/features/permission_feature.cc',
-        'common/features/permission_feature.h',
-        'common/features/simple_feature.cc',
-        'common/features/simple_feature.h',
-        'common/features/simple_feature_filter.cc',
-        'common/features/simple_feature_filter.h',
-        'common/file_util.cc',
-        'common/file_util.h',
-        'common/guest_view/guest_view_constants.cc',
-        'common/guest_view/guest_view_constants.h',
-        'common/install_warning.cc',
-        'common/install_warning.h',
-        'common/manifest.cc',
-        'common/manifest.h',
-        'common/manifest_constants.cc',
-        'common/manifest_constants.h',
-        'common/manifest_handler.cc',
-        'common/manifest_handler.h',
-        'common/manifest_handler_helpers.cc',
-        'common/manifest_handler_helpers.h',
-        'common/manifest_handlers/background_info.cc',
-        'common/manifest_handlers/background_info.h',
-        'common/manifest_handlers/csp_info.cc',
-        'common/manifest_handlers/csp_info.h',
-        'common/manifest_handlers/externally_connectable.cc',
-        'common/manifest_handlers/externally_connectable.h',
-        'common/manifest_handlers/file_handler_info.cc',
-        'common/manifest_handlers/file_handler_info.h',
-        'common/manifest_handlers/icons_handler.cc',
-        'common/manifest_handlers/icons_handler.h',
-        'common/manifest_handlers/incognito_info.cc',
-        'common/manifest_handlers/incognito_info.h',
-        'common/manifest_handlers/kiosk_mode_info.cc',
-        'common/manifest_handlers/kiosk_mode_info.h',
-        'common/manifest_handlers/launcher_page_info.cc',
-        'common/manifest_handlers/launcher_page_info.h',
-        'common/manifest_handlers/oauth2_manifest_handler.cc',
-        'common/manifest_handlers/oauth2_manifest_handler.h',
-        'common/manifest_handlers/offline_enabled_info.cc',
-        'common/manifest_handlers/offline_enabled_info.h',
-        'common/manifest_handlers/options_page_info.cc',
-        'common/manifest_handlers/options_page_info.h',
-        'common/manifest_handlers/permissions_parser.cc',
-        'common/manifest_handlers/permissions_parser.h',
-        'common/manifest_handlers/requirements_info.cc',
-        'common/manifest_handlers/requirements_info.h',
-        'common/manifest_handlers/sandboxed_page_info.cc',
-        'common/manifest_handlers/sandboxed_page_info.h',
-        'common/manifest_handlers/shared_module_info.cc',
-        'common/manifest_handlers/shared_module_info.h',
-        'common/manifest_handlers/web_accessible_resources_info.cc',
-        'common/manifest_handlers/web_accessible_resources_info.h',
-        'common/manifest_handlers/webview_info.cc',
-        'common/manifest_handlers/webview_info.h',
-        'common/manifest_url_handlers.cc',
-        'common/manifest_url_handlers.h',
-        'common/message_bundle.cc',
-        'common/message_bundle.h',
-        'common/one_shot_event.cc',
-        'common/one_shot_event.h',
-        'common/permissions/api_permission.cc',
-        'common/permissions/api_permission.h',
-        'common/permissions/api_permission_set.cc',
-        'common/permissions/api_permission_set.h',
-        'common/permissions/base_set_operators.h',
-        'common/permissions/extensions_api_permissions.cc',
-        'common/permissions/extensions_api_permissions.h',
-        'common/permissions/manifest_permission.cc',
-        'common/permissions/manifest_permission.h',
-        'common/permissions/manifest_permission_set.cc',
-        'common/permissions/manifest_permission_set.h',
-        'common/permissions/media_galleries_permission.cc',
-        'common/permissions/media_galleries_permission.h',
-        'common/permissions/media_galleries_permission_data.cc',
-        'common/permissions/media_galleries_permission_data.h',
-        'common/permissions/permission_message.cc',
-        'common/permissions/permission_message.h',
-        'common/permissions/permission_message_provider.cc',
-        'common/permissions/permission_message_provider.h',
-        'common/permissions/permission_message_util.cc',
-        'common/permissions/permission_message_util.h',
-        'common/permissions/permission_set.cc',
-        'common/permissions/permission_set.h',
-        'common/permissions/permissions_data.cc',
-        'common/permissions/permissions_data.h',
-        'common/permissions/permissions_info.cc',
-        'common/permissions/permissions_info.h',
-        'common/permissions/permissions_provider.h',
-        'common/permissions/set_disjunction_permission.h',
-        'common/permissions/settings_override_permission.cc',
-        'common/permissions/settings_override_permission.h',
-        'common/permissions/socket_permission.cc',
-        'common/permissions/socket_permission.h',
-        'common/permissions/socket_permission_data.cc',
-        'common/permissions/socket_permission_data.h',
-        'common/permissions/socket_permission_entry.cc',
-        'common/permissions/socket_permission_entry.h',
-        'common/permissions/usb_device_permission.cc',
-        'common/permissions/usb_device_permission.h',
-        'common/permissions/usb_device_permission_data.cc',
-        'common/permissions/usb_device_permission_data.h',
-        'common/stack_frame.cc',
-        'common/stack_frame.h',
-        'common/switches.cc',
-        'common/switches.h',
-        'common/update_manifest.cc',
-        'common/update_manifest.h',
-        'common/url_pattern.cc',
-        'common/url_pattern.h',
-        'common/url_pattern_set.cc',
-        'common/url_pattern_set.h',
-        'common/user_script.cc',
-        'common/user_script.h',
-        'common/value_counter.cc',
-        'common/value_counter.h',
-        'common/view_type.cc',
-        'common/view_type.h',
+        '<@(extensions_common_sources)',
+
+        # Mojom generated files should not be included in the common gypi source
+        # list because GN has proper mojom dependency support.
         '<(SHARED_INTERMEDIATE_DIR)/extensions/common/mojo/keep_alive.mojom.cc',
         '<(SHARED_INTERMEDIATE_DIR)/extensions/common/mojo/keep_alive.mojom.h',
         '<(SHARED_INTERMEDIATE_DIR)/extensions/common/mojo/stash.mojom.cc',
@@ -267,8 +87,32 @@
           # NaClModulesHandler does not use any code in NaCl, so no dependency
           # on nacl_common.
           'sources': [
-            'common/manifest_handlers/nacl_modules_handler.cc',
-            'common/manifest_handlers/nacl_modules_handler.h',
+            '<@(extensions_common_sources_nacl)',
+          ],
+        }],
+        ['use_openssl==1', {
+          'sources': [
+            '<@(extensions_common_sources_openssl)',
+          ],
+          'dependencies': [
+            '../third_party/boringssl/boringssl.gyp:boringssl',
+          ],
+        }, {
+          'sources': [
+            '<@(extensions_common_sources_nonopenssl)'
+          ],
+          'conditions': [
+            ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+              'dependencies': [
+                '../build/linux/system.gyp:ssl',
+              ],
+            }],
+            ['OS == "mac" or OS == "ios" or OS == "win"', {
+              'dependencies': [
+                '../third_party/nss/nss.gyp:nspr',
+                '../third_party/nss/nss.gyp:nss',
+              ],
+            }],
           ],
         }],
       ],
@@ -280,12 +124,17 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_prefs',
-        '../components/components.gyp:copresence_sockets',
+        '../components/components.gyp:browsing_data',
+        '../components/components.gyp:device_event_log_component',
+        '../components/components.gyp:guest_view',
         '../components/components.gyp:keyed_service_content',
         '../components/components.gyp:keyed_service_core',
+        '../components/components.gyp:onc_component',
         '../components/components.gyp:pref_registry',
         '../components/components.gyp:sessions_content',
         '../components/components.gyp:storage_monitor',
+        '../components/components.gyp:ui_zoom',
+        '../components/components.gyp:variations',
         '../components/components.gyp:web_cache_browser',
         '../components/components.gyp:web_modal',
         '../content/content.gyp:content_browser',
@@ -309,472 +158,7 @@
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
-        # Note: sources list duplicated in GN build.
-        # NOTE: When moving an API out of Chrome be sure to verify that the
-        # Android build still compiles. See conditions below.
-        'browser/api/activity_log/web_request_constants.cc',
-        'browser/api/activity_log/web_request_constants.h',
-        'browser/api/api_resource.cc',
-        'browser/api/api_resource.h',
-        'browser/api/api_resource_manager.h',
-        'browser/api/app_current_window_internal/app_current_window_internal_api.cc',
-        'browser/api/app_current_window_internal/app_current_window_internal_api.h',
-        'browser/api/app_runtime/app_runtime_api.cc',
-        'browser/api/app_runtime/app_runtime_api.h',
-        'browser/api/app_view/app_view_guest_internal_api.cc',
-        'browser/api/app_view/app_view_guest_internal_api.h',
-        'browser/api/app_window/app_window_api.cc',
-        'browser/api/app_window/app_window_api.h',
-        'browser/api/async_api_function.cc',
-        'browser/api/async_api_function.h',
-        'browser/api/bluetooth/bluetooth_api.cc',
-        'browser/api/bluetooth/bluetooth_api.h',
-        'browser/api/bluetooth/bluetooth_api_pairing_delegate.cc',
-        'browser/api/bluetooth/bluetooth_api_pairing_delegate.h',
-        'browser/api/bluetooth/bluetooth_api_utils.cc',
-        'browser/api/bluetooth/bluetooth_api_utils.h',
-        'browser/api/bluetooth/bluetooth_event_router.cc',
-        'browser/api/bluetooth/bluetooth_event_router.h',
-        'browser/api/bluetooth/bluetooth_extension_function.cc',
-        'browser/api/bluetooth/bluetooth_extension_function.h',
-        'browser/api/bluetooth/bluetooth_private_api.cc',
-        'browser/api/bluetooth/bluetooth_private_api.h',
-        'browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc',
-        'browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h',
-        'browser/api/bluetooth_low_energy/bluetooth_low_energy_connection.cc',
-        'browser/api/bluetooth_low_energy/bluetooth_low_energy_connection.h',
-        'browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc',
-        'browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h',
-        'browser/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.cc',
-        'browser/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.h',
-        'browser/api/bluetooth_low_energy/utils.cc',
-        'browser/api/bluetooth_low_energy/utils.h',
-        'browser/api/bluetooth_socket/bluetooth_api_socket.cc',
-        'browser/api/bluetooth_socket/bluetooth_api_socket.h',
-        'browser/api/bluetooth_socket/bluetooth_socket_api.cc',
-        'browser/api/bluetooth_socket/bluetooth_socket_api.h',
-        'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc',
-        'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h',
-        'browser/api/capture_web_contents_function.cc',
-        'browser/api/capture_web_contents_function.h',
-        'browser/api/cast_channel/cast_auth_ica.cc',
-        'browser/api/cast_channel/cast_auth_ica.h',
-        'browser/api/cast_channel/cast_auth_util.cc',
-        'browser/api/cast_channel/cast_auth_util.h',
-        'browser/api/cast_channel/cast_channel_api.cc',
-        'browser/api/cast_channel/cast_channel_api.h',
-        'browser/api/cast_channel/cast_framer.cc',
-        'browser/api/cast_channel/cast_framer.h',
-        'browser/api/cast_channel/cast_message_util.cc',
-        'browser/api/cast_channel/cast_message_util.h',
-        'browser/api/cast_channel/cast_socket.cc',
-        'browser/api/cast_channel/cast_socket.h',
-        'browser/api/cast_channel/cast_framer.cc',
-        'browser/api/cast_channel/cast_framer.h',
-        'browser/api/cast_channel/cast_transport.h',
-        'browser/api/cast_channel/cast_transport.cc',
-        'browser/api/cast_channel/logger.cc',
-        'browser/api/cast_channel/logger.h',
-        'browser/api/cast_channel/logger_util.cc',
-        'browser/api/cast_channel/logger_util.h',
-        'browser/api/copresence_socket/copresence_socket_api.cc',
-        'browser/api/copresence_socket/copresence_socket_api.h',
-        'browser/api/copresence_socket/copresence_socket_resources.cc',
-        'browser/api/copresence_socket/copresence_socket_resources.h',
-        'browser/api/declarative/deduping_factory.h',
-        'browser/api/declarative/declarative_api.cc',
-        'browser/api/declarative/declarative_api.h',
-        'browser/api/declarative/declarative_rule.h',
-        'browser/api/declarative/rules_cache_delegate.cc',
-        'browser/api/declarative/rules_cache_delegate.h',
-        'browser/api/declarative/rules_registry.cc',
-        'browser/api/declarative/rules_registry.h',
-        'browser/api/declarative/rules_registry_service.cc',
-        'browser/api/declarative/rules_registry_service.h',
-        'browser/api/declarative/test_rules_registry.cc',
-        'browser/api/declarative/test_rules_registry.h',
-        'browser/api/declarative_content/content_rules_registry.h',
-        'browser/api/declarative_webrequest/request_stage.cc',
-        'browser/api/declarative_webrequest/request_stage.h',
-        'browser/api/declarative_webrequest/webrequest_action.cc',
-        'browser/api/declarative_webrequest/webrequest_action.h',
-        'browser/api/declarative_webrequest/webrequest_condition.cc',
-        'browser/api/declarative_webrequest/webrequest_condition.h',
-        'browser/api/declarative_webrequest/webrequest_condition_attribute.cc',
-        'browser/api/declarative_webrequest/webrequest_condition_attribute.h',
-        'browser/api/declarative_webrequest/webrequest_constants.cc',
-        'browser/api/declarative_webrequest/webrequest_constants.h',
-        'browser/api/declarative_webrequest/webrequest_rules_registry.cc',
-        'browser/api/declarative_webrequest/webrequest_rules_registry.h',
-        'browser/api/device_permissions_manager.cc',
-        'browser/api/device_permissions_manager.h',
-        'browser/api/device_permissions_prompt.cc',
-        'browser/api/device_permissions_prompt.h',
-        'browser/api/dns/dns_api.cc',
-        'browser/api/dns/dns_api.h',
-        'browser/api/dns/host_resolver_wrapper.cc',
-        'browser/api/dns/host_resolver_wrapper.h',
-        'browser/api/execute_code_function.cc',
-        'browser/api/execute_code_function.h',
-        'browser/api/extensions_api_client.cc',
-        'browser/api/extensions_api_client.h',
-        'browser/api/guest_view/guest_view_internal_api.cc',
-        'browser/api/guest_view/guest_view_internal_api.h',
-        'browser/api/hid/hid_api.cc',
-        'browser/api/hid/hid_api.h',
-        'browser/api/hid/hid_connection_resource.cc',
-        'browser/api/hid/hid_connection_resource.h',
-        'browser/api/hid/hid_device_manager.cc',
-        'browser/api/hid/hid_device_manager.h',
-        'browser/api/management/management_api.cc',
-        'browser/api/management/management_api.h',
-        'browser/api/management/management_api_delegate.h',
-        'browser/api/management/management_api_constants.cc',
-        'browser/api/management/management_api_constants.h',
-        'browser/api/messaging/native_message_host.cc',
-        'browser/api/power/power_api.cc',
-        'browser/api/power/power_api.h',
-        'browser/api/power/power_api_manager.cc',
-        'browser/api/power/power_api_manager.h',
-        'browser/api/runtime/runtime_api.cc',
-        'browser/api/runtime/runtime_api.h',
-        'browser/api/runtime/runtime_api_delegate.cc',
-        'browser/api/runtime/runtime_api_delegate.h',
-        'browser/api/serial/serial_api.cc',
-        'browser/api/serial/serial_api.h',
-        'browser/api/serial/serial_connection.cc',
-        'browser/api/serial/serial_connection.h',
-        'browser/api/serial/serial_event_dispatcher.cc',
-        'browser/api/serial/serial_event_dispatcher.h',
-        'browser/api/socket/socket.cc',
-        'browser/api/socket/socket.h',
-        'browser/api/socket/socket_api.cc',
-        'browser/api/socket/socket_api.h',
-        'browser/api/socket/tcp_socket.cc',
-        'browser/api/socket/tcp_socket.h',
-        'browser/api/socket/tls_socket.cc',
-        'browser/api/socket/tls_socket.h',
-        'browser/api/socket/udp_socket.cc',
-        'browser/api/socket/udp_socket.h',
-        'browser/api/sockets_tcp/sockets_tcp_api.cc',
-        'browser/api/sockets_tcp/sockets_tcp_api.h',
-        'browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc',
-        'browser/api/sockets_tcp/tcp_socket_event_dispatcher.h',
-        'browser/api/sockets_tcp_server/sockets_tcp_server_api.cc',
-        'browser/api/sockets_tcp_server/sockets_tcp_server_api.h',
-        'browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc',
-        'browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h',
-        'browser/api/sockets_udp/sockets_udp_api.cc',
-        'browser/api/sockets_udp/sockets_udp_api.h',
-        'browser/api/sockets_udp/udp_socket_event_dispatcher.cc',
-        'browser/api/sockets_udp/udp_socket_event_dispatcher.h',
-        'browser/api/storage/leveldb_settings_storage_factory.cc',
-        'browser/api/storage/leveldb_settings_storage_factory.h',
-        'browser/api/storage/local_value_store_cache.cc',
-        'browser/api/storage/local_value_store_cache.h',
-        'browser/api/storage/settings_namespace.cc',
-        'browser/api/storage/settings_namespace.h',
-        'browser/api/storage/settings_observer.h',
-        'browser/api/storage/settings_storage_factory.h',
-        'browser/api/storage/settings_storage_quota_enforcer.cc',
-        'browser/api/storage/settings_storage_quota_enforcer.h',
-        'browser/api/storage/storage_api.cc',
-        'browser/api/storage/storage_api.h',
-        'browser/api/storage/storage_frontend.cc',
-        'browser/api/storage/storage_frontend.h',
-        'browser/api/storage/value_store_cache.cc',
-        'browser/api/storage/value_store_cache.h',
-        'browser/api/storage/weak_unlimited_settings_storage.cc',
-        'browser/api/storage/weak_unlimited_settings_storage.h',
-        'browser/api/system_cpu/cpu_info_provider.cc',
-        'browser/api/system_cpu/cpu_info_provider.h',
-        'browser/api/system_cpu/cpu_info_provider_linux.cc',
-        'browser/api/system_cpu/cpu_info_provider_mac.cc',
-        'browser/api/system_cpu/cpu_info_provider_win.cc',
-        'browser/api/system_cpu/system_cpu_api.cc',
-        'browser/api/system_cpu/system_cpu_api.h',
-        'browser/api/system_display/display_info_provider.cc',
-        'browser/api/system_display/display_info_provider.h',
-        'browser/api/system_display/system_display_api.cc',
-        'browser/api/system_display/system_display_api.h',
-        'browser/api/system_info/system_info_api.cc',
-        'browser/api/system_info/system_info_api.h',
-        'browser/api/system_info/system_info_provider.cc',
-        'browser/api/system_info/system_info_provider.h',
-        'browser/api/system_memory/memory_info_provider.cc',
-        'browser/api/system_memory/memory_info_provider.h',
-        'browser/api/system_memory/system_memory_api.cc',
-        'browser/api/system_memory/system_memory_api.h',
-        'browser/api/system_network/system_network_api.cc',
-        'browser/api/system_network/system_network_api.h',
-        'browser/api/system_storage/storage_info_provider.cc',
-        'browser/api/system_storage/storage_info_provider.h',
-        'browser/api/system_storage/system_storage_api.cc',
-        'browser/api/system_storage/system_storage_api.h',
-        'browser/api/test/test_api.cc',
-        'browser/api/test/test_api.h',
-        'browser/api/usb/usb_api.cc',
-        'browser/api/usb/usb_api.h',
-        'browser/api/usb/usb_device_resource.cc',
-        'browser/api/usb/usb_device_resource.h',
-        'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc',
-        'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h',
-        'browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h',
-        'browser/api/vpn_provider/vpn_provider_api.cc',
-        'browser/api/vpn_provider/vpn_provider_api.h',
-        'browser/api/web_request/form_data_parser.cc',
-        'browser/api/web_request/form_data_parser.h',
-        'browser/api/web_request/upload_data_presenter.cc',
-        'browser/api/web_request/upload_data_presenter.h',
-        'browser/api/web_request/web_request_api.cc',
-        'browser/api/web_request/web_request_api.h',
-        'browser/api/web_request/web_request_api_constants.cc',
-        'browser/api/web_request/web_request_api_constants.h',
-        'browser/api/web_request/web_request_api_helpers.cc',
-        'browser/api/web_request/web_request_api_helpers.h',
-        'browser/api/web_request/web_request_event_router_delegate.cc',
-        'browser/api/web_request/web_request_event_router_delegate.h',
-        'browser/api/web_request/web_request_permissions.cc',
-        'browser/api/web_request/web_request_permissions.h',
-        'browser/api/web_request/web_request_time_tracker.cc',
-        'browser/api/web_request/web_request_time_tracker.h',
-        'browser/api/web_view/web_view_internal_api.cc',
-        'browser/api/web_view/web_view_internal_api.h',
-        'browser/api/webcam_private/webcam_private_api.h',
-        'browser/api/webcam_private/webcam_private_api_chromeos.cc',
-        'browser/api_activity_monitor.h',
-        'browser/app_sorting.h',
-        'browser/app_window/app_delegate.h',
-        'browser/app_window/app_web_contents_helper.cc',
-        'browser/app_window/app_web_contents_helper.h',
-        'browser/app_window/app_window.cc',
-        'browser/app_window/app_window.h',
-        'browser/app_window/app_window_contents.cc',
-        'browser/app_window/app_window_contents.h',
-        'browser/app_window/app_window_geometry_cache.cc',
-        'browser/app_window/app_window_geometry_cache.h',
-        'browser/app_window/app_window_registry.cc',
-        'browser/app_window/app_window_registry.h',
-        'browser/app_window/app_window_client.cc',
-        'browser/app_window/app_window_client.h',
-        'browser/app_window/native_app_window.h',
-        'browser/app_window/size_constraints.cc',
-        'browser/app_window/size_constraints.h',
-        'browser/blacklist_state.h',
-        'browser/blob_holder.cc',
-        'browser/blob_holder.h',
-        'browser/browser_context_keyed_api_factory.h',
-        'browser/browser_context_keyed_service_factories.cc',
-        'browser/browser_context_keyed_service_factories.h',
-        'browser/component_extension_resource_manager.h',
-        'browser/computed_hashes.cc',
-        'browser/computed_hashes.h',
-        'browser/content_hash_fetcher.cc',
-        'browser/content_hash_fetcher.h',
-        'browser/content_hash_reader.cc',
-        'browser/content_hash_reader.h',
-        'browser/content_hash_tree.cc',
-        'browser/content_hash_tree.h',
-        'browser/content_verifier.cc',
-        'browser/content_verifier.h',
-        'browser/content_verifier_delegate.h',
-        'browser/content_verifier_io_data.cc',
-        'browser/content_verifier_io_data.h',
-        'browser/content_verify_job.cc',
-        'browser/content_verify_job.h',
-        'browser/error_map.cc',
-        'browser/error_map.h',
-        'browser/event_listener_map.cc',
-        'browser/event_listener_map.h',
-        'browser/event_router.cc',
-        'browser/event_router.h',
-        'browser/extension_host.cc',
-        'browser/extension_host.h',
-        'browser/extension_host_delegate.h',
-        'browser/extension_error.cc',
-        'browser/extension_error.h',
-        'browser/extension_function.cc',
-        'browser/extension_function.h',
-        'browser/extension_function_dispatcher.cc',
-        'browser/extension_function_dispatcher.h',
-        'browser/extension_function_registry.cc',
-        'browser/extension_function_registry.h',
-        'browser/extension_function_util.cc',
-        'browser/extension_function_util.h',
-        'browser/extension_icon_image.cc',
-        'browser/extension_icon_image.h',
-        'browser/extension_message_filter.cc',
-        'browser/extension_message_filter.h',
-        'browser/extension_pref_store.cc',
-        'browser/extension_pref_store.h',
-        'browser/extension_pref_value_map.cc',
-        'browser/extension_pref_value_map_factory.cc',
-        'browser/extension_pref_value_map_factory.h',
-        'browser/extension_pref_value_map.h',
-        'browser/extension_prefs.cc',
-        'browser/extension_prefs.h',
-        'browser/extension_prefs_factory.cc',
-        'browser/extension_prefs_factory.h',
-        'browser/extension_prefs_observer.h',
-        'browser/extension_prefs_scope.h',
-        'browser/extension_protocols.cc',
-        'browser/extension_protocols.h',
-        'browser/extension_registry.cc',
-        'browser/extension_registry.h',
-        'browser/extension_registry_factory.cc',
-        'browser/extension_registry_factory.h',
-        'browser/extension_registry_observer.h',
-        'browser/extension_scoped_prefs.h',
-        'browser/extension_system.cc',
-        'browser/extension_system.h',
-        'browser/extension_system_provider.cc',
-        'browser/extension_system_provider.h',
-        'browser/extension_util.cc',
-        'browser/extension_util.h',
-        'browser/extension_web_contents_observer.cc',
-        'browser/extension_web_contents_observer.h',
-        'browser/extensions_browser_client.cc',
-        'browser/extensions_browser_client.h',
-        'browser/external_provider_interface.h',
-        'browser/granted_file_entry.cc',
-        'browser/granted_file_entry.h',
-        'browser/guest_view/app_view/app_view_constants.cc',
-        'browser/guest_view/app_view/app_view_constants.h',
-        'browser/guest_view/app_view/app_view_guest.cc',
-        'browser/guest_view/app_view/app_view_guest.h',
-        'browser/guest_view/app_view/app_view_guest_delegate.cc',
-        'browser/guest_view/app_view/app_view_guest_delegate.h',
-        'browser/guest_view/extension_options/extension_options_constants.cc',
-        'browser/guest_view/extension_options/extension_options_constants.h',
-        'browser/guest_view/extension_options/extension_options_guest.cc',
-        'browser/guest_view/extension_options/extension_options_guest.h',
-        'browser/guest_view/extension_options/extension_options_guest_delegate.cc',
-        'browser/guest_view/extension_options/extension_options_guest_delegate.h',
-        'browser/guest_view/guest_view_base.cc',
-        'browser/guest_view/guest_view_base.h',
-        'browser/guest_view/guest_view_manager_factory.h',
-        'browser/guest_view/guest_view_manager.cc',
-        'browser/guest_view/guest_view_manager.h',
-        'browser/guest_view/guest_view.h',
-        'browser/guest_view/mime_handler_view/mime_handler_view_constants.cc',
-        'browser/guest_view/mime_handler_view/mime_handler_view_constants.h',
-        'browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.cc',
-        'browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h',
-        'browser/guest_view/mime_handler_view/mime_handler_view_guest.cc',
-        'browser/guest_view/mime_handler_view/mime_handler_view_guest.h',
-        'browser/guest_view/web_view/javascript_dialog_helper.cc',
-        'browser/guest_view/web_view/javascript_dialog_helper.h',
-        'browser/guest_view/web_view/web_view_constants.cc',
-        'browser/guest_view/web_view/web_view_constants.h',
-        'browser/guest_view/web_view/web_view_find_helper.cc',
-        'browser/guest_view/web_view/web_view_find_helper.h',
-        'browser/guest_view/web_view/web_view_guest.cc',
-        'browser/guest_view/web_view/web_view_guest.h',
-        'browser/guest_view/web_view/web_view_guest_delegate.h',
-        'browser/guest_view/web_view/web_view_permission_types.h',
-        'browser/guest_view/web_view/web_view_permission_helper.cc',
-        'browser/guest_view/web_view/web_view_permission_helper.h',
-        'browser/guest_view/web_view/web_view_permission_helper_delegate.cc',
-        'browser/guest_view/web_view/web_view_permission_helper_delegate.h',
-        'browser/guest_view/web_view/web_view_renderer_state.cc',
-        'browser/guest_view/web_view/web_view_renderer_state.h',
-        'browser/image_loader.cc',
-        'browser/image_loader.h',
-        'browser/image_loader_factory.cc',
-        'browser/image_loader_factory.h',
-        'browser/image_util.cc',
-        'browser/image_util.h',
-        'browser/info_map.cc',
-        'browser/info_map.h',
-        'browser/install/crx_installer_error.h',
-        'browser/install/extension_install_ui.cc',
-        'browser/install/extension_install_ui.h',
-        'browser/install_flag.h',
-        'browser/file_highlighter.cc',
-        'browser/file_highlighter.h',
-        'browser/file_reader.cc',
-        'browser/file_reader.h',
-        'browser/lazy_background_task_queue.cc',
-        'browser/lazy_background_task_queue.h',
-        'browser/management_policy.cc',
-        'browser/management_policy.h',
-        'browser/mojo/keep_alive_impl.cc',
-        'browser/mojo/keep_alive_impl.h',
-        'browser/mojo/service_registration_manager.cc',
-        'browser/mojo/service_registration_manager.h',
-        'browser/mojo/stash_backend.cc',
-        'browser/mojo/stash_backend.h',
-        'browser/notification_types.h',
-        'browser/null_app_sorting.cc',
-        'browser/null_app_sorting.h',
-        'browser/pref_names.cc',
-        'browser/pref_names.h',
-        'browser/process_manager.cc',
-        'browser/process_manager.h',
-        'browser/process_manager_delegate.h',
-        'browser/process_manager_factory.cc',
-        'browser/process_manager_factory.h',
-        'browser/process_manager_observer.h',
-        'browser/process_map.cc',
-        'browser/process_map.h',
-        'browser/process_map_factory.cc',
-        'browser/process_map_factory.h',
-        'browser/quota_service.cc',
-        'browser/quota_service.h',
-        'browser/renderer_startup_helper.cc',
-        'browser/renderer_startup_helper.h',
-        'browser/runtime_data.cc',
-        'browser/runtime_data.h',
-        'browser/script_execution_observer.h',
-        'browser/script_executor.cc',
-        'browser/script_executor.h',
-        'browser/state_store.cc',
-        'browser/state_store.h',
-        'browser/suggest_permission_util.cc',
-        'browser/suggest_permission_util.h',
-        'browser/uninstall_reason.h',
-        'browser/update_observer.h',
-        'browser/updater/extension_cache.h',
-        'browser/updater/extension_downloader.cc',
-        'browser/updater/extension_downloader.h',
-        'browser/updater/extension_downloader_delegate.cc',
-        'browser/updater/extension_downloader_delegate.h',
-        'browser/updater/manifest_fetch_data.cc',
-        'browser/updater/manifest_fetch_data.h',
-        'browser/updater/null_extension_cache.cc',
-        'browser/updater/null_extension_cache.h',
-        'browser/updater/request_queue.h',
-        'browser/updater/request_queue_impl.h',
-        'browser/updater/safe_manifest_parser.cc',
-        'browser/updater/safe_manifest_parser.h',
-        'browser/updater/update_service.cc',
-        'browser/updater/update_service.h',
-        'browser/updater/update_service_factory.cc',
-        'browser/updater/update_service_factory.h',
-        'browser/url_request_util.cc',
-        'browser/url_request_util.h',
-        'browser/value_store/leveldb_value_store.cc',
-        'browser/value_store/leveldb_value_store.h',
-        'browser/value_store/testing_value_store.cc',
-        'browser/value_store/testing_value_store.h',
-        'browser/value_store/value_store.cc',
-        'browser/value_store/value_store.h',
-        'browser/value_store/value_store_change.cc',
-        'browser/value_store/value_store_change.h',
-        'browser/value_store/value_store_frontend.cc',
-        'browser/value_store/value_store_frontend.h',
-        'browser/value_store/value_store_util.cc',
-        'browser/value_store/value_store_util.h',
-        'browser/verified_contents.cc',
-        'browser/verified_contents.h',
-        'browser/view_type_utils.cc',
-        'browser/view_type_utils.h',
-        'browser/warning_service.cc',
-        'browser/warning_service.h',
-        'browser/warning_service_factory.cc',
-        'browser/warning_service_factory.h',
-        'browser/warning_set.cc',
-        'browser/warning_set.h',
+        '<@(extensions_browser_sources)',
       ],
       'conditions': [
         # This condition exists only because the extensions_common_constants
@@ -785,30 +169,33 @@
             '../components/components.gyp:storage_monitor',
           ],
         }],
-        ['use_openssl==1', {
+        ['chromeos == 1', {
+          'dependencies': [
+            '../chromeos/chromeos.gyp:chromeos',
+          ],
           'sources': [
-            'browser/api/cast_channel/cast_auth_util_openssl.cc',
+            '<@(extensions_browser_sources_chromeos)',
           ],
+        }, {  # chromeos==0
+          'sources': [
+            '<@(extensions_browser_sources_nonchromeos)',
+          ],
+        }],
+        ['OS == "win" or OS == "mac"', {
           'dependencies': [
-            '../third_party/boringssl/boringssl.gyp:boringssl',
+            '../components/components.gyp:wifi_component',
           ],
-        }, {
           'sources': [
-            # cast_auth_util_nss.cc uses NSS functions.
-            'browser/api/cast_channel/cast_auth_util_nss.cc',
+            '<@(extensions_browser_sources_win_or_mac)',
           ],
-          'conditions': [
-            ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
-              'dependencies': [
-                '../build/linux/system.gyp:ssl',
-              ],
-            }],
-            ['OS == "mac" or OS == "ios" or OS == "win"', {
-              'dependencies': [
-                '../third_party/nss/nss.gyp:nspr',
-                '../third_party/nss/nss.gyp:nss',
-              ],
-            }],
+        }],
+        ['OS == "linux" and chromeos == 0', {
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../dbus/dbus.gyp:dbus',
+          ],
+          'sources': [
+            '<@(extensions_browser_sources_linux_nonchromeos)',
           ],
         }],
       ],
@@ -821,167 +208,17 @@
       'type': 'static_library',
       'dependencies': [
         'extensions_resources.gyp:extensions_resources',
+        '../components/components.gyp:guest_view',
         '../content/content.gyp:content_resources',
         '../gin/gin.gyp:gin',
-        '../mojo/public/mojo_public.gyp:mojo_js_bindings',
         '../third_party/WebKit/public/blink.gyp:blink',
+        '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        # Note: sources list duplicated in GN build.
-        'renderer/activity_log_converter_strategy.cc',
-        'renderer/activity_log_converter_strategy.h',
-        'renderer/api/automation/automation_api_helper.cc',
-        'renderer/api/automation/automation_api_helper.h',
-        'renderer/api_activity_logger.cc',
-        'renderer/api_activity_logger.h',
-        'renderer/api_definitions_natives.cc',
-        'renderer/api_definitions_natives.h',
-        'renderer/app_runtime_custom_bindings.cc',
-        'renderer/app_runtime_custom_bindings.h',
-        'renderer/app_window_custom_bindings.cc',
-        'renderer/app_window_custom_bindings.h',
-        'renderer/binding_generating_native_handler.cc',
-        'renderer/binding_generating_native_handler.h',
-        'renderer/blob_native_handler.cc',
-        'renderer/blob_native_handler.h',
-        'renderer/console.cc',
-        'renderer/console.h',
-        'renderer/content_watcher.cc',
-        'renderer/content_watcher.h',
-        'renderer/context_menus_custom_bindings.cc',
-        'renderer/context_menus_custom_bindings.h',
-        'renderer/css_native_handler.cc',
-        'renderer/css_native_handler.h',
-        'renderer/default_dispatcher_delegate.cc',
-        'renderer/default_dispatcher_delegate.h',
-        'renderer/dispatcher.cc',
-        'renderer/dispatcher.h',
-        'renderer/dispatcher_delegate.h',
-        'renderer/document_custom_bindings.cc',
-        'renderer/document_custom_bindings.h',
-        'renderer/dom_activity_logger.cc',
-        'renderer/dom_activity_logger.h',
-        'renderer/event_bindings.cc',
-        'renderer/event_bindings.h',
-        'renderer/extension_groups.h',
-        'renderer/extension_helper.cc',
-        'renderer/extension_helper.h',
-        'renderer/extensions_render_frame_observer.cc',
-        'renderer/extensions_render_frame_observer.h',
-        'renderer/extensions_renderer_client.cc',
-        'renderer/extensions_renderer_client.h',
-        'renderer/file_system_natives.cc',
-        'renderer/file_system_natives.h',
-        'renderer/guest_view/extensions_guest_view_container.cc',
-        'renderer/guest_view/extensions_guest_view_container.h',
-        'renderer/guest_view/guest_view_container.cc',
-        'renderer/guest_view/guest_view_container.h',
-        'renderer/guest_view/guest_view_internal_custom_bindings.cc',
-        'renderer/guest_view/guest_view_internal_custom_bindings.h',
-        'renderer/guest_view/mime_handler_view_container.cc',
-        'renderer/guest_view/mime_handler_view_container.h',
-        'renderer/i18n_custom_bindings.cc',
-        'renderer/i18n_custom_bindings.h',
-        'renderer/id_generator_custom_bindings.cc',
-        'renderer/id_generator_custom_bindings.h',
-        'renderer/lazy_background_page_native_handler.cc',
-        'renderer/lazy_background_page_native_handler.h',
-        'renderer/logging_native_handler.cc',
-        'renderer/logging_native_handler.h',
-        'renderer/messaging_bindings.cc',
-        'renderer/messaging_bindings.h',
-        'renderer/module_system.cc',
-        'renderer/module_system.h',
-        'renderer/native_handler.cc',
-        'renderer/native_handler.h',
-        'renderer/object_backed_native_handler.cc',
-        'renderer/object_backed_native_handler.h',
-        'renderer/print_native_handler.cc',
-        'renderer/print_native_handler.h',
-        'renderer/process_info_native_handler.cc',
-        'renderer/process_info_native_handler.h',
-        'renderer/programmatic_script_injector.cc',
-        'renderer/programmatic_script_injector.h',
-        'renderer/render_view_observer_natives.cc',
-        'renderer/request_sender.cc',
-        'renderer/request_sender.h',
-        'renderer/resource_bundle_source_map.cc',
-        'renderer/resource_bundle_source_map.h',
-        'renderer/resources/app_runtime_custom_bindings.js',
-        'renderer/resources/app_window_custom_bindings.js',
-        'renderer/resources/binding.js',
-        'renderer/resources/context_menus_custom_bindings.js',
-        'renderer/resources/declarative_webrequest_custom_bindings.js',
-        'renderer/resources/entry_id_manager.js',
-        'renderer/resources/event.js',
-        'renderer/resources/extension.css',
-        'renderer/resources/extension_custom_bindings.js',
-        'renderer/resources/extension_fonts.css',
-        'renderer/resources/greasemonkey_api.js',
-        'renderer/resources/i18n_custom_bindings.js',
-        'renderer/resources/image_util.js',
-        'renderer/resources/json_schema.js',
-        'renderer/resources/last_error.js',
-        'renderer/resources/messaging.js',
-        'renderer/resources/messaging_utils.js',
-        'renderer/resources/permissions_custom_bindings.js',
-        'renderer/resources/platform_app.css',
-        'renderer/resources/platform_app.js',
-        'renderer/resources/runtime_custom_bindings.js',
-        'renderer/resources/schema_utils.js',
-        'renderer/resources/send_request.js',
-        'renderer/resources/set_icon.js',
-        'renderer/resources/storage_area.js',
-        'renderer/resources/test_custom_bindings.js',
-        'renderer/resources/uncaught_exception_handler.js',
-        'renderer/resources/unload_event.js',
-        'renderer/resources/utils.js',
-        'renderer/resources/extensions/web_view.js',
-        'renderer/resources/extensions/web_view_events.js',
-        'renderer/resources/extensions/web_view_experimental.js',
-        'renderer/resources/web_request_custom_bindings.js',
-        'renderer/resources/web_request_internal_custom_bindings.js',
-        'renderer/runtime_custom_bindings.cc',
-        'renderer/runtime_custom_bindings.h',
-        'renderer/safe_builtins.cc',
-        'renderer/safe_builtins.h',
-        'renderer/scoped_persistent.h',
-        'renderer/script_context.cc',
-        'renderer/script_context.h',
-        'renderer/script_context_set.cc',
-        'renderer/script_context_set.h',
-        'renderer/script_injection.cc',
-        'renderer/script_injection.h',
-        'renderer/script_injection_manager.cc',
-        'renderer/script_injection_manager.h',
-        'renderer/script_injector.h',
-        'renderer/scripts_run_info.cc',
-        'renderer/scripts_run_info.h',
-        'renderer/send_request_natives.cc',
-        'renderer/send_request_natives.h',
-        'renderer/set_icon_natives.cc',
-        'renderer/set_icon_natives.h',
-        'renderer/static_v8_external_one_byte_string_resource.cc',
-        'renderer/static_v8_external_one_byte_string_resource.h',
-        'renderer/test_features_native_handler.cc',
-        'renderer/test_features_native_handler.h',
-        'renderer/user_gestures_native_handler.cc',
-        'renderer/user_gestures_native_handler.h',
-        'renderer/user_script_injector.cc',
-        'renderer/user_script_injector.h',
-        'renderer/user_script_set.cc',
-        'renderer/user_script_set.h',
-        'renderer/user_script_set_manager.cc',
-        'renderer/user_script_set_manager.h',
-        'renderer/utils_native_handler.cc',
-        'renderer/utils_native_handler.h',
-        'renderer/v8_context_native_handler.cc',
-        'renderer/v8_context_native_handler.h',
-        'renderer/v8_schema_registry.cc',
-        'renderer/v8_schema_registry.h',
+        '<@(extensions_renderer_sources)',
       ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
@@ -992,14 +229,15 @@
       'type': 'static_library',
       'dependencies': [
         '../content/content.gyp:content_utility',
+        '../third_party/zlib/google/zip.gyp:zip',
         'extensions_common',
+        'extensions_strings.gyp:extensions_strings',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'utility/utility_handler.cc',
-        'utility/utility_handler.h',
+        '<@(extensions_utility_sources)',
       ],
     },
     {
@@ -1008,6 +246,7 @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
+        '../base/base.gyp:base_prefs_test_support',
         '../components/components.gyp:user_prefs',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
@@ -1015,6 +254,7 @@
         '../net/net.gyp:net_test_support',
         '../testing/gtest.gyp:gtest',
         'browser/api/api_registration.gyp:extensions_api_registration',
+        'common/api/api.gyp:cast_channel_proto',
         'common/api/api.gyp:extensions_api',
         'extensions_browser',
         'extensions_common',
@@ -1025,51 +265,7 @@
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
-        # Note: sources list duplicated in GN build.
-        'browser/api/dns/mock_host_resolver_creator.cc',
-        'browser/api/dns/mock_host_resolver_creator.h',
-        'browser/api/storage/settings_test_util.cc',
-        'browser/api/storage/settings_test_util.h',
-        'browser/api_test_utils.cc',
-        'browser/api_test_utils.h',
-        'browser/api_unittest.cc',
-        'browser/api_unittest.h',
-        'browser/extension_error_test_util.cc',
-        'browser/extension_error_test_util.h',
-        'browser/extensions_test.cc',
-        'browser/extensions_test.h',
-        'browser/guest_view/test_guest_view_manager.cc',
-        'browser/guest_view/test_guest_view_manager.h',
-        'browser/mock_extension_system.cc',
-        'browser/mock_extension_system.h',
-        'browser/test_extension_registry_observer.cc',
-        'browser/test_extension_registry_observer.h',
-        'browser/test_extensions_browser_client.cc',
-        'browser/test_extensions_browser_client.h',
-        'browser/test_management_policy.cc',
-        'browser/test_management_policy.h',
-        'browser/test_runtime_api_delegate.cc',
-        'browser/test_runtime_api_delegate.h',
-        'common/extension_builder.cc',
-        'common/extension_builder.h',
-        'common/manifest_test.cc',
-        'common/manifest_test.h',
-        'common/test_util.cc',
-        'common/test_util.h',
-        'common/value_builder.cc',
-        'common/value_builder.h',
-        'renderer/test_extensions_renderer_client.cc',
-        'renderer/test_extensions_renderer_client.h',
-        'test/extension_test_message_listener.cc',
-        'test/extension_test_message_listener.h',
-        'test/result_catcher.cc',
-        'test/result_catcher.h',
-        'test/test_extensions_client.cc',
-        'test/test_extensions_client.h',
-        'test/test_permission_message_provider.cc',
-        'test/test_permission_message_provider.h',
-        'test/test_service_registration_manager.cc',
-        'test/test_service_registration_manager.h',
+        '<@(extensions_test_support_sources)',
       ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
@@ -1097,6 +293,7 @@
           'action_name': 'repack_extensions_shell_and_test_pak',
           'variables': {
             'pak_inputs': [
+              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
@@ -1109,7 +306,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
           },
@@ -1117,145 +314,5 @@
         },
       ],
     },
-    {
-      'target_name': 'extensions_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_prefs_test_support',
-        '../base/base.gyp:test_support_base',
-        '../components/components.gyp:keyed_service_content',
-        '../components/components.gyp:user_prefs',
-        '../content/content_shell_and_tests.gyp:test_support_content',
-        '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
-        '../device/serial/serial.gyp:device_serial',
-        '../device/serial/serial.gyp:device_serial_test_util',
-        '../mojo/edk/mojo_edk.gyp:mojo_js_lib',
-        '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
-        '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-        'common/api/api.gyp:cast_channel_proto',
-        'extensions_common',
-        'extensions_renderer',
-        'extensions_resources.gyp:extensions_resources',
-        'extensions_shell_and_test_pak',
-        'extensions_strings.gyp:extensions_strings',
-        'extensions_test_support',
-      ],
-      # Needed for third_party libraries like leveldb.
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'browser/api/api_resource_manager_unittest.cc',
-        'browser/api/bluetooth/bluetooth_event_router_unittest.cc',
-        'browser/api/cast_channel/cast_auth_ica_unittest.cc',
-        'browser/api/cast_channel/cast_auth_util_unittest.cc',
-        'browser/api/cast_channel/cast_channel_api_unittest.cc',
-        'browser/api/cast_channel/cast_framer_unittest.cc',
-        'browser/api/cast_channel/cast_socket_unittest.cc',
-        'browser/api/cast_channel/cast_transport_unittest.cc',
-        'browser/api/cast_channel/logger_unittest.cc',
-        'browser/api/declarative/declarative_rule_unittest.cc',
-        'browser/api/declarative/deduping_factory_unittest.cc',
-        'browser/api/declarative/rules_registry_unittest.cc',
-        'browser/api/declarative_webrequest/webrequest_condition_unittest.cc',
-        'browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc',
-        'browser/api/power/power_api_unittest.cc',
-        'browser/api/sockets_tcp/sockets_tcp_api_unittest.cc',
-        'browser/api/storage/settings_quota_unittest.cc',
-        'browser/api/storage/storage_api_unittest.cc',
-        'browser/api/storage/storage_frontend_unittest.cc',
-        'browser/api/web_request/form_data_parser_unittest.cc',
-        'browser/api/web_request/upload_data_presenter_unittest.cc',
-        'browser/api/web_request/web_request_time_tracker_unittest.cc',
-        'browser/app_window/app_window_geometry_cache_unittest.cc',
-        'browser/computed_hashes_unittest.cc',
-        'browser/content_hash_tree_unittest.cc',
-        'browser/event_listener_map_unittest.cc',
-        'browser/event_router_unittest.cc',
-        'browser/error_map_unittest.cc',
-        'browser/extension_icon_image_unittest.cc',
-        'browser/extension_pref_value_map_unittest.cc',
-        'browser/extension_registry_unittest.cc',
-        'browser/file_highlighter_unittest.cc',
-        'browser/file_reader_unittest.cc',
-        'browser/guest_view/guest_view_manager_unittest.cc',
-        'browser/image_loader_unittest.cc',
-        'browser/image_util_unittest.cc',
-        'browser/info_map_unittest.cc',
-        'browser/lazy_background_task_queue_unittest.cc',
-        'browser/management_policy_unittest.cc',
-        'browser/mojo/keep_alive_impl_unittest.cc',
-        'browser/mojo/stash_backend_unittest.cc',
-        'browser/process_manager_unittest.cc',
-        'browser/process_map_unittest.cc',
-        'browser/quota_service_unittest.cc',
-        'browser/runtime_data_unittest.cc',
-        'browser/value_store/leveldb_value_store_unittest.cc',
-        'browser/value_store/testing_value_store_unittest.cc',
-        'browser/value_store/value_store_change_unittest.cc',
-        'browser/value_store/value_store_frontend_unittest.cc',
-        'browser/value_store/value_store_unittest.cc',
-        'browser/value_store/value_store_unittest.h',
-        'browser/verified_contents_unittest.cc',
-        'browser/warning_service_unittest.cc',
-        'common/api/sockets/sockets_manifest_permission_unittest.cc',
-        'common/csp_validator_unittest.cc',
-        'common/event_filter_unittest.cc',
-        'common/extension_l10n_util_unittest.cc',
-        'common/extension_resource_unittest.cc',
-        'common/extension_set_unittest.cc',
-        'common/features/base_feature_provider_unittest.cc',
-        'common/features/complex_feature_unittest.cc',
-        'common/features/simple_feature_unittest.cc',
-        'common/file_util_unittest.cc',
-        'common/manifest_handler_unittest.cc',
-        'common/manifest_handlers/externally_connectable_unittest.cc',
-        'common/manifest_handlers/file_handler_manifest_unittest.cc',
-        'common/manifest_handlers/oauth2_manifest_unittest.cc',
-        'common/manifest_handlers/shared_module_manifest_unittest.cc',
-        'common/message_bundle_unittest.cc',
-        'common/one_shot_event_unittest.cc',
-        'common/permissions/api_permission_set_unittest.cc',
-        'common/permissions/manifest_permission_set_unittest.cc',
-        'common/permissions/socket_permission_unittest.cc',
-        'common/permissions/usb_device_permission_unittest.cc',
-        'common/stack_frame_unittest.cc',
-        'common/url_pattern_set_unittest.cc',
-        'common/url_pattern_unittest.cc',
-        'common/user_script_unittest.cc',
-        'renderer/activity_log_converter_strategy_unittest.cc',
-        'renderer/api/serial/data_receiver_unittest.cc',
-        'renderer/api/serial/data_sender_unittest.cc',
-        'renderer/api/serial/serial_api_unittest.cc',
-        'renderer/api_test_base.cc',
-        'renderer/api_test_base.h',
-        'renderer/api_test_base_unittest.cc',
-        'renderer/event_unittest.cc',
-        'renderer/json_schema_unittest.cc',
-        'renderer/mojo/keep_alive_client_unittest.cc',
-        'renderer/messaging_utils_unittest.cc',
-        'renderer/module_system_test.cc',
-        'renderer/module_system_test.h',
-        'renderer/module_system_unittest.cc',
-        'renderer/safe_builtins_unittest.cc',
-        'renderer/script_context_set_unittest.cc',
-        'renderer/utils_unittest.cc',
-        'test/extensions_unittests_main.cc',
-      ],
-      # Disable c4267 warnings until we fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-      'conditions': [
-        ['OS=="win" and win_use_allocator_shim==1', {
-          'dependencies': [
-            '../base/allocator/allocator.gyp:allocator',
-          ],
-        }],
-      ],
-    },
   ]
 }
diff --git a/chromium/extensions/extensions.gypi b/chromium/extensions/extensions.gypi
new file mode 100644
index 00000000000..f90e9a2f998
--- /dev/null
+++ b/chromium/extensions/extensions.gypi
@@ -0,0 +1,1051 @@
+# Copyright 2015 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.
+
+{
+  'variables': {
+    'extensions_common_constants_sources': [
+      'common/constants.cc',
+      'common/constants.h',
+    ],
+    'extensions_common_mojo_sources': [
+      'common/mojo/keep_alive.mojom',
+      'common/mojo/stash.mojom',
+    ],
+    'extensions_common_sources': [
+      'common/api/bluetooth/bluetooth_manifest_data.cc',
+      'common/api/bluetooth/bluetooth_manifest_data.h',
+      'common/api/bluetooth/bluetooth_manifest_handler.cc',
+      'common/api/bluetooth/bluetooth_manifest_handler.h',
+      'common/api/bluetooth/bluetooth_manifest_permission.cc',
+      'common/api/bluetooth/bluetooth_manifest_permission.h',
+      'common/api/messaging/message.h',
+      'common/api/printer_provider/usb_printer_manifest_data.cc',
+      'common/api/printer_provider/usb_printer_manifest_data.h',
+      'common/api/printer_provider/usb_printer_manifest_handler.cc',
+      'common/api/printer_provider/usb_printer_manifest_handler.h',
+      'common/api/sockets/sockets_manifest_data.cc',
+      'common/api/sockets/sockets_manifest_data.h',
+      'common/api/sockets/sockets_manifest_handler.cc',
+      'common/api/sockets/sockets_manifest_handler.h',
+      'common/api/sockets/sockets_manifest_permission.cc',
+      'common/api/sockets/sockets_manifest_permission.h',
+      'common/cast/cast_cert_validator.cc',
+      'common/cast/cast_cert_validator.h',
+      'common/common_manifest_handlers.cc',
+      'common/common_manifest_handlers.h',
+      'common/csp_validator.cc',
+      'common/csp_validator.h',
+      'common/dom_action_types.h',
+      'common/draggable_region.cc',
+      'common/draggable_region.h',
+      'common/error_utils.cc',
+      'common/error_utils.h',
+      'common/event_filter.cc',
+      'common/event_filter.h',
+      'common/event_filtering_info.cc',
+      'common/event_filtering_info.h',
+      'common/event_matcher.cc',
+      'common/event_matcher.h',
+      'common/extension.cc',
+      'common/extension.h',
+      'common/extension_api.cc',
+      'common/extension_api.h',
+      'common/extension_icon_set.cc',
+      'common/extension_icon_set.h',
+      'common/extension_l10n_util.cc',
+      'common/extension_l10n_util.h',
+      'common/extension_message_generator.cc',
+      'common/extension_message_generator.h',
+      'common/extension_messages.cc',
+      'common/extension_messages.h',
+      'common/extension_paths.cc',
+      'common/extension_paths.h',
+      'common/extension_resource.cc',
+      'common/extension_resource.h',
+      'common/extension_set.cc',
+      'common/extension_set.h',
+      'common/extension_urls.cc',
+      'common/extension_urls.h',
+      'common/extension_utility_messages.h',
+      'common/extensions_client.cc',
+      'common/extensions_client.h',
+      'common/feature_switch.cc',
+      'common/feature_switch.h',
+      'common/features/api_feature.cc',
+      'common/features/api_feature.h',
+      'common/features/base_feature_provider.cc',
+      'common/features/base_feature_provider.h',
+      'common/features/behavior_feature.cc',
+      'common/features/behavior_feature.h',
+      'common/features/complex_feature.cc',
+      'common/features/complex_feature.h',
+      'common/features/feature.cc',
+      'common/features/feature.h',
+      'common/features/feature_provider.cc',
+      'common/features/feature_provider.h',
+      'common/features/json_feature_provider_source.cc',
+      'common/features/json_feature_provider_source.h',
+      'common/features/manifest_feature.cc',
+      'common/features/manifest_feature.h',
+      'common/features/permission_feature.cc',
+      'common/features/permission_feature.h',
+      'common/features/simple_feature.cc',
+      'common/features/simple_feature.h',
+      'common/features/simple_feature_filter.cc',
+      'common/features/simple_feature_filter.h',
+      'common/file_util.cc',
+      'common/file_util.h',
+      'common/guest_view/extensions_guest_view_messages.h',
+      'common/host_id.cc',
+      'common/host_id.h',
+      'common/image_util.cc',
+      'common/image_util.h',
+      'common/install_warning.cc',
+      'common/install_warning.h',
+      'common/manifest.cc',
+      'common/manifest.h',
+      'common/manifest_constants.cc',
+      'common/manifest_constants.h',
+      'common/manifest_handler.cc',
+      'common/manifest_handler.h',
+      'common/manifest_handler_helpers.cc',
+      'common/manifest_handler_helpers.h',
+      'common/manifest_handlers/background_info.cc',
+      'common/manifest_handlers/background_info.h',
+      'common/manifest_handlers/content_capabilities_handler.cc',
+      'common/manifest_handlers/content_capabilities_handler.h',
+      'common/manifest_handlers/csp_info.cc',
+      'common/manifest_handlers/csp_info.h',
+      'common/manifest_handlers/default_locale_handler.cc',
+      'common/manifest_handlers/default_locale_handler.h',
+      'common/manifest_handlers/externally_connectable.cc',
+      'common/manifest_handlers/externally_connectable.h',
+      'common/manifest_handlers/file_handler_info.cc',
+      'common/manifest_handlers/file_handler_info.h',
+      'common/manifest_handlers/icons_handler.cc',
+      'common/manifest_handlers/icons_handler.h',
+      'common/manifest_handlers/incognito_info.cc',
+      'common/manifest_handlers/incognito_info.h',
+      'common/manifest_handlers/kiosk_mode_info.cc',
+      'common/manifest_handlers/kiosk_mode_info.h',
+      'common/manifest_handlers/launcher_page_info.cc',
+      'common/manifest_handlers/launcher_page_info.h',
+      'common/manifest_handlers/mime_types_handler.cc',
+      'common/manifest_handlers/mime_types_handler.h',
+      'common/manifest_handlers/oauth2_manifest_handler.cc',
+      'common/manifest_handlers/oauth2_manifest_handler.h',
+      'common/manifest_handlers/offline_enabled_info.cc',
+      'common/manifest_handlers/offline_enabled_info.h',
+      'common/manifest_handlers/options_page_info.cc',
+      'common/manifest_handlers/options_page_info.h',
+      'common/manifest_handlers/permissions_parser.cc',
+      'common/manifest_handlers/permissions_parser.h',
+      'common/manifest_handlers/requirements_info.cc',
+      'common/manifest_handlers/requirements_info.h',
+      'common/manifest_handlers/sandboxed_page_info.cc',
+      'common/manifest_handlers/sandboxed_page_info.h',
+      'common/manifest_handlers/shared_module_info.cc',
+      'common/manifest_handlers/shared_module_info.h',
+      'common/manifest_handlers/web_accessible_resources_info.cc',
+      'common/manifest_handlers/web_accessible_resources_info.h',
+      'common/manifest_handlers/webview_info.cc',
+      'common/manifest_handlers/webview_info.h',
+      'common/manifest_url_handlers.cc',
+      'common/manifest_url_handlers.h',
+      'common/message_bundle.cc',
+      'common/message_bundle.h',
+      'common/one_shot_event.cc',
+      'common/one_shot_event.h',
+      'common/permissions/api_permission.cc',
+      'common/permissions/api_permission.h',
+      'common/permissions/api_permission_set.cc',
+      'common/permissions/api_permission_set.h',
+      'common/permissions/base_set_operators.h',
+      'common/permissions/coalesced_permission_message.cc',
+      'common/permissions/coalesced_permission_message.h',
+      'common/permissions/extensions_api_permissions.cc',
+      'common/permissions/extensions_api_permissions.h',
+      'common/permissions/manifest_permission.cc',
+      'common/permissions/manifest_permission.h',
+      'common/permissions/manifest_permission_set.cc',
+      'common/permissions/manifest_permission_set.h',
+      'common/permissions/media_galleries_permission.cc',
+      'common/permissions/media_galleries_permission.h',
+      'common/permissions/media_galleries_permission_data.cc',
+      'common/permissions/media_galleries_permission_data.h',
+      'common/permissions/permission_message.cc',
+      'common/permissions/permission_message.h',
+      'common/permissions/permission_message_provider.cc',
+      'common/permissions/permission_message_provider.h',
+      'common/permissions/permission_message_util.cc',
+      'common/permissions/permission_message_util.h',
+      'common/permissions/permission_set.cc',
+      'common/permissions/permission_set.h',
+      'common/permissions/permissions_data.cc',
+      'common/permissions/permissions_data.h',
+      'common/permissions/permissions_info.cc',
+      'common/permissions/permissions_info.h',
+      'common/permissions/permissions_provider.h',
+      'common/permissions/set_disjunction_permission.h',
+      'common/permissions/settings_override_permission.cc',
+      'common/permissions/settings_override_permission.h',
+      'common/permissions/socket_permission.cc',
+      'common/permissions/socket_permission.h',
+      'common/permissions/socket_permission_data.cc',
+      'common/permissions/socket_permission_data.h',
+      'common/permissions/socket_permission_entry.cc',
+      'common/permissions/socket_permission_entry.h',
+      'common/permissions/usb_device_permission.cc',
+      'common/permissions/usb_device_permission.h',
+      'common/permissions/usb_device_permission_data.cc',
+      'common/permissions/usb_device_permission_data.h',
+      'common/stack_frame.cc',
+      'common/stack_frame.h',
+      'common/switches.cc',
+      'common/switches.h',
+      'common/update_manifest.cc',
+      'common/update_manifest.h',
+      'common/url_pattern.cc',
+      'common/url_pattern.h',
+      'common/url_pattern_set.cc',
+      'common/url_pattern_set.h',
+      'common/user_script.cc',
+      'common/user_script.h',
+      'common/value_builder.cc',
+      'common/value_builder.h',
+      'common/value_counter.cc',
+      'common/value_counter.h',
+      'common/view_type.cc',
+      'common/view_type.h',
+    ],
+    'extensions_common_sources_nacl': [
+      'common/manifest_handlers/nacl_modules_handler.cc',
+      'common/manifest_handlers/nacl_modules_handler.h',
+    ],
+    'extensions_common_sources_openssl': [
+      'common/cast/cast_cert_validator_openssl.cc',
+    ],
+    'extensions_common_sources_nonopenssl': [
+      'common/cast/cast_cert_validator_nss.cc',
+    ],
+    'extensions_browser_sources': [
+      # NOTE: When moving an API out of Chrome be sure to verify that the
+      # Android build still compiles. See conditions below.
+      'browser/api/activity_log/web_request_constants.cc',
+      'browser/api/activity_log/web_request_constants.h',
+      'browser/api/alarms/alarm_manager.cc',
+      'browser/api/alarms/alarm_manager.h',
+      'browser/api/alarms/alarms_api.cc',
+      'browser/api/alarms/alarms_api.h',
+      'browser/api/api_resource.cc',
+      'browser/api/api_resource.h',
+      'browser/api/api_resource_manager.h',
+      'browser/api/app_current_window_internal/app_current_window_internal_api.cc',
+      'browser/api/app_current_window_internal/app_current_window_internal_api.h',
+      'browser/api/app_runtime/app_runtime_api.cc',
+      'browser/api/app_runtime/app_runtime_api.h',
+      'browser/api/app_window/app_window_api.cc',
+      'browser/api/app_window/app_window_api.h',
+      'browser/api/async_api_function.cc',
+      'browser/api/async_api_function.h',
+      'browser/api/audio/audio_api.cc',
+      'browser/api/audio/audio_api.h',
+      'browser/api/audio/audio_service.h',
+      'browser/api/bluetooth/bluetooth_api.cc',
+      'browser/api/bluetooth/bluetooth_api.h',
+      'browser/api/bluetooth/bluetooth_api_pairing_delegate.cc',
+      'browser/api/bluetooth/bluetooth_api_pairing_delegate.h',
+      'browser/api/bluetooth/bluetooth_api_utils.cc',
+      'browser/api/bluetooth/bluetooth_api_utils.h',
+      'browser/api/bluetooth/bluetooth_event_router.cc',
+      'browser/api/bluetooth/bluetooth_event_router.h',
+      'browser/api/bluetooth/bluetooth_extension_function.cc',
+      'browser/api/bluetooth/bluetooth_extension_function.h',
+      'browser/api/bluetooth/bluetooth_private_api.cc',
+      'browser/api/bluetooth/bluetooth_private_api.h',
+      'browser/api/bluetooth_low_energy/bluetooth_api_advertisement.cc',
+      'browser/api/bluetooth_low_energy/bluetooth_api_advertisement.h',
+      'browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc',
+      'browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h',
+      'browser/api/bluetooth_low_energy/bluetooth_low_energy_connection.cc',
+      'browser/api/bluetooth_low_energy/bluetooth_low_energy_connection.h',
+      'browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc',
+      'browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h',
+      'browser/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.cc',
+      'browser/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.h',
+      'browser/api/bluetooth_low_energy/utils.cc',
+      'browser/api/bluetooth_low_energy/utils.h',
+      'browser/api/bluetooth_socket/bluetooth_api_socket.cc',
+      'browser/api/bluetooth_socket/bluetooth_api_socket.h',
+      'browser/api/bluetooth_socket/bluetooth_socket_api.cc',
+      'browser/api/bluetooth_socket/bluetooth_socket_api.h',
+      'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc',
+      'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h',
+      'browser/api/capture_web_contents_function.cc',
+      'browser/api/capture_web_contents_function.h',
+      'browser/api/cast_channel/cast_auth_ica.cc',
+      'browser/api/cast_channel/cast_auth_ica.h',
+      'browser/api/cast_channel/cast_auth_util.cc',
+      'browser/api/cast_channel/cast_auth_util.h',
+      'browser/api/cast_channel/cast_channel_api.cc',
+      'browser/api/cast_channel/cast_channel_api.h',
+      'browser/api/cast_channel/cast_framer.cc',
+      'browser/api/cast_channel/cast_framer.h',
+      'browser/api/cast_channel/cast_message_util.cc',
+      'browser/api/cast_channel/cast_message_util.h',
+      'browser/api/cast_channel/cast_socket.cc',
+      'browser/api/cast_channel/cast_socket.h',
+      'browser/api/cast_channel/cast_transport.cc',
+      'browser/api/cast_channel/cast_transport.h',
+      'browser/api/cast_channel/keep_alive_delegate.cc',
+      'browser/api/cast_channel/keep_alive_delegate.h',
+      'browser/api/cast_channel/logger.cc',
+      'browser/api/cast_channel/logger.h',
+      'browser/api/cast_channel/logger_util.cc',
+      'browser/api/cast_channel/logger_util.h',
+      'browser/api/declarative/declarative_api.cc',
+      'browser/api/declarative/declarative_api.h',
+      'browser/api/declarative/declarative_rule.h',
+      'browser/api/declarative/deduping_factory.h',
+      'browser/api/declarative/rules_cache_delegate.cc',
+      'browser/api/declarative/rules_cache_delegate.h',
+      'browser/api/declarative/rules_registry.cc',
+      'browser/api/declarative/rules_registry.h',
+      'browser/api/declarative/rules_registry_service.cc',
+      'browser/api/declarative/rules_registry_service.h',
+      'browser/api/declarative/test_rules_registry.cc',
+      'browser/api/declarative/test_rules_registry.h',
+      'browser/api/declarative_content/content_rules_registry.h',
+      'browser/api/declarative_webrequest/request_stage.cc',
+      'browser/api/declarative_webrequest/request_stage.h',
+      'browser/api/declarative_webrequest/webrequest_action.cc',
+      'browser/api/declarative_webrequest/webrequest_action.h',
+      'browser/api/declarative_webrequest/webrequest_condition.cc',
+      'browser/api/declarative_webrequest/webrequest_condition.h',
+      'browser/api/declarative_webrequest/webrequest_condition_attribute.cc',
+      'browser/api/declarative_webrequest/webrequest_condition_attribute.h',
+      'browser/api/declarative_webrequest/webrequest_constants.cc',
+      'browser/api/declarative_webrequest/webrequest_constants.h',
+      'browser/api/declarative_webrequest/webrequest_rules_registry.cc',
+      'browser/api/declarative_webrequest/webrequest_rules_registry.h',
+      'browser/api/device_permissions_manager.cc',
+      'browser/api/device_permissions_manager.h',
+      'browser/api/device_permissions_prompt.cc',
+      'browser/api/device_permissions_prompt.h',
+      'browser/api/dns/dns_api.cc',
+      'browser/api/dns/dns_api.h',
+      'browser/api/dns/host_resolver_wrapper.cc',
+      'browser/api/dns/host_resolver_wrapper.h',
+      'browser/api/document_scan/document_scan_api.cc',
+      'browser/api/document_scan/document_scan_api.h',
+      'browser/api/document_scan/document_scan_interface.cc',
+      'browser/api/document_scan/document_scan_interface.h',
+      'browser/api/document_scan/document_scan_interface_chromeos.cc',
+      'browser/api/execute_code_function.cc',
+      'browser/api/execute_code_function.h',
+      'browser/api/extensions_api_client.cc',
+      'browser/api/extensions_api_client.h',
+      'browser/api/guest_view/app_view/app_view_guest_internal_api.cc',
+      'browser/api/guest_view/app_view/app_view_guest_internal_api.h',
+      'browser/api/guest_view/extension_view/extension_view_internal_api.cc',
+      'browser/api/guest_view/extension_view/extension_view_internal_api.h',
+      'browser/api/guest_view/guest_view_internal_api.cc',
+      'browser/api/guest_view/guest_view_internal_api.h',
+      'browser/api/guest_view/web_view/web_view_internal_api.cc',
+      'browser/api/guest_view/web_view/web_view_internal_api.h',
+      'browser/api/hid/hid_api.cc',
+      'browser/api/hid/hid_api.h',
+      'browser/api/hid/hid_connection_resource.cc',
+      'browser/api/hid/hid_connection_resource.h',
+      'browser/api/hid/hid_device_manager.cc',
+      'browser/api/hid/hid_device_manager.h',
+      'browser/api/idle/idle_api.cc',
+      'browser/api/idle/idle_api.h',
+      'browser/api/idle/idle_api_constants.cc',
+      'browser/api/idle/idle_api_constants.h',
+      'browser/api/idle/idle_manager.cc',
+      'browser/api/idle/idle_manager.h',
+      'browser/api/idle/idle_manager_factory.cc',
+      'browser/api/idle/idle_manager_factory.h',
+      'browser/api/management/management_api.cc',
+      'browser/api/management/management_api.h',
+      'browser/api/management/management_api_constants.cc',
+      'browser/api/management/management_api_constants.h',
+      'browser/api/management/management_api_delegate.h',
+      'browser/api/messaging/native_message_host.cc',
+      'browser/api/mime_handler_private/mime_handler_private.cc',
+      'browser/api/mime_handler_private/mime_handler_private.h',
+      'browser/api/networking_private/networking_private_api.cc',
+      'browser/api/networking_private/networking_private_api.h',
+      'browser/api/networking_private/networking_private_chromeos.cc',
+      'browser/api/networking_private/networking_private_chromeos.h',
+      'browser/api/networking_private/networking_private_delegate.cc',
+      'browser/api/networking_private/networking_private_delegate.h',
+      'browser/api/networking_private/networking_private_delegate_factory.cc',
+      'browser/api/networking_private/networking_private_delegate_factory.h',
+      'browser/api/networking_private/networking_private_delegate_observer.h',
+      'browser/api/networking_private/networking_private_event_router.h',
+      'browser/api/networking_private/networking_private_event_router_chromeos.cc',
+      'browser/api/networking_private/networking_private_event_router_factory.cc',
+      'browser/api/networking_private/networking_private_event_router_factory.h',
+      'browser/api/power/power_api.cc',
+      'browser/api/power/power_api.h',
+      'browser/api/printer_provider/printer_provider_api.cc',
+      'browser/api/printer_provider/printer_provider_api.h',
+      'browser/api/printer_provider/printer_provider_api_factory.cc',
+      'browser/api/printer_provider/printer_provider_api_factory.h',
+      'browser/api/printer_provider/printer_provider_print_job.cc',
+      'browser/api/printer_provider/printer_provider_print_job.h',
+      'browser/api/printer_provider_internal/printer_provider_internal_api.cc',
+      'browser/api/printer_provider_internal/printer_provider_internal_api.h',
+      'browser/api/printer_provider_internal/printer_provider_internal_api_observer.h',
+      'browser/api/runtime/runtime_api.cc',
+      'browser/api/runtime/runtime_api.h',
+      'browser/api/runtime/runtime_api_delegate.cc',
+      'browser/api/runtime/runtime_api_delegate.h',
+      'browser/api/serial/serial_api.cc',
+      'browser/api/serial/serial_api.h',
+      'browser/api/serial/serial_connection.cc',
+      'browser/api/serial/serial_connection.h',
+      'browser/api/serial/serial_event_dispatcher.cc',
+      'browser/api/serial/serial_event_dispatcher.h',
+      'browser/api/serial/serial_service_factory.cc',
+      'browser/api/serial/serial_service_factory.h',
+      'browser/api/socket/socket.cc',
+      'browser/api/socket/socket.h',
+      'browser/api/socket/socket_api.cc',
+      'browser/api/socket/socket_api.h',
+      'browser/api/socket/tcp_socket.cc',
+      'browser/api/socket/tcp_socket.h',
+      'browser/api/socket/tls_socket.cc',
+      'browser/api/socket/tls_socket.h',
+      'browser/api/socket/udp_socket.cc',
+      'browser/api/socket/udp_socket.h',
+      'browser/api/sockets_tcp/sockets_tcp_api.cc',
+      'browser/api/sockets_tcp/sockets_tcp_api.h',
+      'browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc',
+      'browser/api/sockets_tcp/tcp_socket_event_dispatcher.h',
+      'browser/api/sockets_tcp_server/sockets_tcp_server_api.cc',
+      'browser/api/sockets_tcp_server/sockets_tcp_server_api.h',
+      'browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc',
+      'browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h',
+      'browser/api/sockets_udp/sockets_udp_api.cc',
+      'browser/api/sockets_udp/sockets_udp_api.h',
+      'browser/api/sockets_udp/udp_socket_event_dispatcher.cc',
+      'browser/api/sockets_udp/udp_socket_event_dispatcher.h',
+      'browser/api/storage/leveldb_settings_storage_factory.cc',
+      'browser/api/storage/leveldb_settings_storage_factory.h',
+      'browser/api/storage/local_value_store_cache.cc',
+      'browser/api/storage/local_value_store_cache.h',
+      'browser/api/storage/settings_namespace.cc',
+      'browser/api/storage/settings_namespace.h',
+      'browser/api/storage/settings_observer.h',
+      'browser/api/storage/settings_storage_factory.h',
+      'browser/api/storage/settings_storage_quota_enforcer.cc',
+      'browser/api/storage/settings_storage_quota_enforcer.h',
+      'browser/api/storage/storage_api.cc',
+      'browser/api/storage/storage_api.h',
+      'browser/api/storage/storage_frontend.cc',
+      'browser/api/storage/storage_frontend.h',
+      'browser/api/storage/value_store_cache.cc',
+      'browser/api/storage/value_store_cache.h',
+      'browser/api/storage/weak_unlimited_settings_storage.cc',
+      'browser/api/storage/weak_unlimited_settings_storage.h',
+      'browser/api/system_cpu/cpu_info_provider.cc',
+      'browser/api/system_cpu/cpu_info_provider.h',
+      'browser/api/system_cpu/cpu_info_provider_linux.cc',
+      'browser/api/system_cpu/cpu_info_provider_mac.cc',
+      'browser/api/system_cpu/cpu_info_provider_win.cc',
+      'browser/api/system_cpu/system_cpu_api.cc',
+      'browser/api/system_cpu/system_cpu_api.h',
+      'browser/api/system_display/display_info_provider.cc',
+      'browser/api/system_display/display_info_provider.h',
+      'browser/api/system_display/system_display_api.cc',
+      'browser/api/system_display/system_display_api.h',
+      'browser/api/system_info/system_info_api.cc',
+      'browser/api/system_info/system_info_api.h',
+      'browser/api/system_info/system_info_provider.cc',
+      'browser/api/system_info/system_info_provider.h',
+      'browser/api/system_memory/memory_info_provider.cc',
+      'browser/api/system_memory/memory_info_provider.h',
+      'browser/api/system_memory/system_memory_api.cc',
+      'browser/api/system_memory/system_memory_api.h',
+      'browser/api/system_network/system_network_api.cc',
+      'browser/api/system_network/system_network_api.h',
+      'browser/api/system_storage/storage_info_provider.cc',
+      'browser/api/system_storage/storage_info_provider.h',
+      'browser/api/system_storage/system_storage_api.cc',
+      'browser/api/system_storage/system_storage_api.h',
+      'browser/api/test/test_api.cc',
+      'browser/api/test/test_api.h',
+      'browser/api/usb/usb_api.cc',
+      'browser/api/usb/usb_api.h',
+      'browser/api/usb/usb_device_resource.cc',
+      'browser/api/usb/usb_device_resource.h',
+      'browser/api/usb/usb_event_router.cc',
+      'browser/api/usb/usb_event_router.h',
+      'browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h',
+      'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc',
+      'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h',
+      'browser/api/web_request/form_data_parser.cc',
+      'browser/api/web_request/form_data_parser.h',
+      'browser/api/web_request/upload_data_presenter.cc',
+      'browser/api/web_request/upload_data_presenter.h',
+      'browser/api/web_request/web_request_api.cc',
+      'browser/api/web_request/web_request_api.h',
+      'browser/api/web_request/web_request_api_constants.cc',
+      'browser/api/web_request/web_request_api_constants.h',
+      'browser/api/web_request/web_request_api_helpers.cc',
+      'browser/api/web_request/web_request_api_helpers.h',
+      'browser/api/web_request/web_request_event_router_delegate.cc',
+      'browser/api/web_request/web_request_event_router_delegate.h',
+      'browser/api/web_request/web_request_permissions.cc',
+      'browser/api/web_request/web_request_permissions.h',
+      'browser/api/web_request/web_request_time_tracker.cc',
+      'browser/api/web_request/web_request_time_tracker.h',
+      'browser/api_activity_monitor.h',
+      'browser/app_sorting.h',
+      'browser/app_window/app_delegate.h',
+      'browser/app_window/app_web_contents_helper.cc',
+      'browser/app_window/app_web_contents_helper.h',
+      'browser/app_window/app_window.cc',
+      'browser/app_window/app_window.h',
+      'browser/app_window/app_window_client.cc',
+      'browser/app_window/app_window_client.h',
+      'browser/app_window/app_window_contents.cc',
+      'browser/app_window/app_window_contents.h',
+      'browser/app_window/app_window_geometry_cache.cc',
+      'browser/app_window/app_window_geometry_cache.h',
+      'browser/app_window/app_window_registry.cc',
+      'browser/app_window/app_window_registry.h',
+      'browser/app_window/native_app_window.h',
+      'browser/app_window/size_constraints.cc',
+      'browser/app_window/size_constraints.h',
+      'browser/bad_message.cc',
+      'browser/bad_message.h',
+      'browser/blacklist_state.h',
+      'browser/blob_holder.cc',
+      'browser/blob_holder.h',
+      'browser/browser_context_keyed_api_factory.h',
+      'browser/browser_context_keyed_service_factories.cc',
+      'browser/browser_context_keyed_service_factories.h',
+      'browser/component_extension_resource_manager.h',
+      'browser/computed_hashes.cc',
+      'browser/computed_hashes.h',
+      'browser/content_hash_fetcher.cc',
+      'browser/content_hash_fetcher.h',
+      'browser/content_hash_reader.cc',
+      'browser/content_hash_reader.h',
+      'browser/content_hash_tree.cc',
+      'browser/content_hash_tree.h',
+      'browser/content_verifier.cc',
+      'browser/content_verifier.h',
+      'browser/content_verifier_delegate.h',
+      'browser/content_verifier_io_data.cc',
+      'browser/content_verifier_io_data.h',
+      'browser/content_verify_job.cc',
+      'browser/content_verify_job.h',
+      'browser/crx_file_info.cc',
+      'browser/crx_file_info.h',
+      'browser/declarative_user_script_manager.cc',
+      'browser/declarative_user_script_manager.h',
+      'browser/declarative_user_script_master.cc',
+      'browser/declarative_user_script_master.h',
+      'browser/deferred_start_render_host.h',
+      'browser/deferred_start_render_host_observer.h',
+      'browser/error_map.cc',
+      'browser/error_map.h',
+      'browser/event_listener_map.cc',
+      'browser/event_listener_map.h',
+      'browser/event_page_tracker.h',
+      'browser/event_router.cc',
+      'browser/event_router.h',
+      'browser/extension_error.cc',
+      'browser/extension_error.h',
+      'browser/extension_function.cc',
+      'browser/extension_function.h',
+      'browser/extension_function_dispatcher.cc',
+      'browser/extension_function_dispatcher.h',
+      'browser/extension_function_registry.cc',
+      'browser/extension_function_registry.h',
+      'browser/extension_function_util.cc',
+      'browser/extension_function_util.h',
+      'browser/extension_host.cc',
+      'browser/extension_host.h',
+      'browser/extension_host_delegate.h',
+      'browser/extension_host_observer.h',
+      'browser/extension_host_queue.h',
+      'browser/extension_icon_image.cc',
+      'browser/extension_icon_image.h',
+      'browser/extension_icon_placeholder.cc',
+      'browser/extension_icon_placeholder.h',
+      'browser/extension_message_filter.cc',
+      'browser/extension_message_filter.h',
+      'browser/extension_pref_store.cc',
+      'browser/extension_pref_store.h',
+      'browser/extension_pref_value_map.cc',
+      'browser/extension_pref_value_map.h',
+      'browser/extension_pref_value_map_factory.cc',
+      'browser/extension_pref_value_map_factory.h',
+      'browser/extension_prefs.cc',
+      'browser/extension_prefs.h',
+      'browser/extension_prefs_factory.cc',
+      'browser/extension_prefs_factory.h',
+      'browser/extension_prefs_observer.h',
+      'browser/extension_prefs_scope.h',
+      'browser/extension_protocols.cc',
+      'browser/extension_protocols.h',
+      'browser/extension_registry.cc',
+      'browser/extension_registry.h',
+      'browser/extension_registry_factory.cc',
+      'browser/extension_registry_factory.h',
+      'browser/extension_registry_observer.h',
+      'browser/extension_scoped_prefs.h',
+      'browser/extension_system.cc',
+      'browser/extension_system.h',
+      'browser/extension_system_provider.cc',
+      'browser/extension_system_provider.h',
+      'browser/extension_user_script_loader.cc',
+      'browser/extension_user_script_loader.h',
+      'browser/extension_util.cc',
+      'browser/extension_util.h',
+      'browser/extension_web_contents_observer.cc',
+      'browser/extension_web_contents_observer.h',
+      'browser/extension_zoom_request_client.cc',
+      'browser/extension_zoom_request_client.h',
+      'browser/extensions_browser_client.cc',
+      'browser/extensions_browser_client.h',
+      'browser/external_provider_interface.h',
+      'browser/file_highlighter.cc',
+      'browser/file_highlighter.h',
+      'browser/file_reader.cc',
+      'browser/file_reader.h',
+      'browser/granted_file_entry.cc',
+      'browser/granted_file_entry.h',
+      'browser/guest_view/app_view/app_view_constants.cc',
+      'browser/guest_view/app_view/app_view_constants.h',
+      'browser/guest_view/app_view/app_view_guest.cc',
+      'browser/guest_view/app_view/app_view_guest.h',
+      'browser/guest_view/app_view/app_view_guest_delegate.cc',
+      'browser/guest_view/app_view/app_view_guest_delegate.h',
+      'browser/guest_view/extension_options/extension_options_constants.cc',
+      'browser/guest_view/extension_options/extension_options_constants.h',
+      'browser/guest_view/extension_options/extension_options_guest.cc',
+      'browser/guest_view/extension_options/extension_options_guest.h',
+      'browser/guest_view/extension_options/extension_options_guest_delegate.cc',
+      'browser/guest_view/extension_options/extension_options_guest_delegate.h',
+      'browser/guest_view/extension_view/extension_view_constants.cc',
+      'browser/guest_view/extension_view/extension_view_constants.h',
+      'browser/guest_view/extension_view/extension_view_guest.cc',
+      'browser/guest_view/extension_view/extension_view_guest.h',
+      'browser/guest_view/extension_view/extension_view_guest_delegate.cc',
+      'browser/guest_view/extension_view/extension_view_guest_delegate.h',
+      'browser/guest_view/extensions_guest_view_manager_delegate.cc',
+      'browser/guest_view/extensions_guest_view_manager_delegate.h',
+      'browser/guest_view/extensions_guest_view_message_filter.cc',
+      'browser/guest_view/extensions_guest_view_message_filter.h',
+      'browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc',
+      'browser/guest_view/mime_handler_view/mime_handler_stream_manager.h',
+      'browser/guest_view/mime_handler_view/mime_handler_view_constants.cc',
+      'browser/guest_view/mime_handler_view/mime_handler_view_constants.h',
+      'browser/guest_view/mime_handler_view/mime_handler_view_guest.cc',
+      'browser/guest_view/mime_handler_view/mime_handler_view_guest.h',
+      'browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.cc',
+      'browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h',
+      'browser/guest_view/surface_worker/surface_worker_constants.cc',
+      'browser/guest_view/surface_worker/surface_worker_constants.h',
+      'browser/guest_view/surface_worker/surface_worker_guest.cc',
+      'browser/guest_view/surface_worker/surface_worker_guest.h',
+      'browser/guest_view/web_view/javascript_dialog_helper.cc',
+      'browser/guest_view/web_view/javascript_dialog_helper.h',
+      'browser/guest_view/web_view/web_ui/web_ui_url_fetcher.cc',
+      'browser/guest_view/web_view/web_ui/web_ui_url_fetcher.h',
+      'browser/guest_view/web_view/web_view_constants.cc',
+      'browser/guest_view/web_view/web_view_constants.h',
+      'browser/guest_view/web_view/web_view_content_script_manager.cc',
+      'browser/guest_view/web_view/web_view_content_script_manager.h',
+      'browser/guest_view/web_view/web_view_find_helper.cc',
+      'browser/guest_view/web_view/web_view_find_helper.h',
+      'browser/guest_view/web_view/web_view_guest.cc',
+      'browser/guest_view/web_view/web_view_guest.h',
+      'browser/guest_view/web_view/web_view_guest_delegate.h',
+      'browser/guest_view/web_view/web_view_permission_helper.cc',
+      'browser/guest_view/web_view/web_view_permission_helper.h',
+      'browser/guest_view/web_view/web_view_permission_helper_delegate.cc',
+      'browser/guest_view/web_view/web_view_permission_helper_delegate.h',
+      'browser/guest_view/web_view/web_view_permission_types.h',
+      'browser/guest_view/web_view/web_view_renderer_state.cc',
+      'browser/guest_view/web_view/web_view_renderer_state.h',
+      'browser/image_loader.cc',
+      'browser/image_loader.h',
+      'browser/image_loader_factory.cc',
+      'browser/image_loader_factory.h',
+      'browser/info_map.cc',
+      'browser/info_map.h',
+      'browser/install/crx_installer_error.h',
+      'browser/install/extension_install_ui.cc',
+      'browser/install/extension_install_ui.h',
+      'browser/install_flag.h',
+      'browser/io_thread_extension_message_filter.cc',
+      'browser/io_thread_extension_message_filter.h',
+      'browser/lazy_background_task_queue.cc',
+      'browser/lazy_background_task_queue.h',
+      'browser/load_monitoring_extension_host_queue.cc',
+      'browser/load_monitoring_extension_host_queue.h',
+      'browser/management_policy.cc',
+      'browser/management_policy.h',
+      'browser/mojo/keep_alive_impl.cc',
+      'browser/mojo/keep_alive_impl.h',
+      'browser/mojo/service_registration.cc',
+      'browser/mojo/service_registration.h',
+      'browser/mojo/stash_backend.cc',
+      'browser/mojo/stash_backend.h',
+      'browser/notification_types.cc',
+      'browser/notification_types.h',
+      'browser/null_app_sorting.cc',
+      'browser/null_app_sorting.h',
+      'browser/pref_names.cc',
+      'browser/pref_names.h',
+      'browser/process_manager.cc',
+      'browser/process_manager.h',
+      'browser/process_manager_delegate.h',
+      'browser/process_manager_factory.cc',
+      'browser/process_manager_factory.h',
+      'browser/process_manager_observer.h',
+      'browser/process_map.cc',
+      'browser/process_map.h',
+      'browser/process_map_factory.cc',
+      'browser/process_map_factory.h',
+      'browser/quota_service.cc',
+      'browser/quota_service.h',
+      'browser/renderer_startup_helper.cc',
+      'browser/renderer_startup_helper.h',
+      'browser/requirements_checker.h',
+      'browser/runtime_data.cc',
+      'browser/runtime_data.h',
+      'browser/sandboxed_unpacker.cc',
+      'browser/sandboxed_unpacker.h',
+      'browser/script_execution_observer.h',
+      'browser/script_executor.cc',
+      'browser/script_executor.h',
+      'browser/serial_extension_host_queue.cc',
+      'browser/serial_extension_host_queue.h',
+      'browser/state_store.cc',
+      'browser/state_store.h',
+      'browser/suggest_permission_util.cc',
+      'browser/suggest_permission_util.h',
+      'browser/uninstall_reason.h',
+      'browser/update_observer.h',
+      'browser/updater/extension_cache.h',
+      'browser/updater/extension_downloader.cc',
+      'browser/updater/extension_downloader.h',
+      'browser/updater/extension_downloader_delegate.cc',
+      'browser/updater/extension_downloader_delegate.h',
+      'browser/updater/manifest_fetch_data.cc',
+      'browser/updater/manifest_fetch_data.h',
+      'browser/updater/null_extension_cache.cc',
+      'browser/updater/null_extension_cache.h',
+      'browser/updater/request_queue.h',
+      'browser/updater/request_queue_impl.h',
+      'browser/updater/safe_manifest_parser.cc',
+      'browser/updater/safe_manifest_parser.h',
+      'browser/updater/update_service.cc',
+      'browser/updater/update_service.h',
+      'browser/updater/update_service_factory.cc',
+      'browser/updater/update_service_factory.h',
+      'browser/url_request_util.cc',
+      'browser/url_request_util.h',
+      'browser/user_script_loader.cc',
+      'browser/user_script_loader.h',
+      'browser/value_store/leveldb_value_store.cc',
+      'browser/value_store/leveldb_value_store.h',
+      'browser/value_store/testing_value_store.cc',
+      'browser/value_store/testing_value_store.h',
+      'browser/value_store/value_store.cc',
+      'browser/value_store/value_store.h',
+      'browser/value_store/value_store_change.cc',
+      'browser/value_store/value_store_change.h',
+      'browser/value_store/value_store_frontend.cc',
+      'browser/value_store/value_store_frontend.h',
+      'browser/value_store/value_store_util.cc',
+      'browser/value_store/value_store_util.h',
+      'browser/verified_contents.cc',
+      'browser/verified_contents.h',
+      'browser/view_type_utils.cc',
+      'browser/view_type_utils.h',
+      'browser/warning_service.cc',
+      'browser/warning_service.h',
+      'browser/warning_service_factory.cc',
+      'browser/warning_service_factory.h',
+      'browser/warning_set.cc',
+      'browser/warning_set.h',
+      'browser/web_ui_user_script_loader.cc',
+      'browser/web_ui_user_script_loader.h',
+    ],
+    'extensions_browser_sources_chromeos': [
+      'browser/api/audio/audio_service_chromeos.cc',
+      'browser/api/diagnostics/diagnostics_api.cc',
+      'browser/api/diagnostics/diagnostics_api.h',
+      'browser/api/diagnostics/diagnostics_api_chromeos.cc',
+      'browser/api/networking_config/networking_config_api.cc',
+      'browser/api/networking_config/networking_config_api.h',
+      'browser/api/networking_config/networking_config_service.cc',
+      'browser/api/networking_config/networking_config_service.h',
+      'browser/api/networking_config/networking_config_service_factory.cc',
+      'browser/api/networking_config/networking_config_service_factory.h',
+      'browser/api/socket/app_firewall_hole_manager.cc',
+      'browser/api/socket/app_firewall_hole_manager.h',
+      'browser/api/vpn_provider/vpn_provider_api.cc',
+      'browser/api/vpn_provider/vpn_provider_api.h',
+      'browser/api/vpn_provider/vpn_service.cc',
+      'browser/api/vpn_provider/vpn_service.h',
+      'browser/api/vpn_provider/vpn_service_factory.h',
+      'browser/api/webcam_private/v4l2_webcam.h',
+      'browser/api/webcam_private/v4l2_webcam.cc',
+      'browser/api/webcam_private/webcam.h',
+      'browser/api/webcam_private/webcam.cc',
+      'browser/api/webcam_private/webcam_private_api.h',
+      'browser/api/webcam_private/webcam_private_api_chromeos.cc',
+    ],
+    'extensions_browser_sources_nonchromeos': [
+      'browser/api/audio/audio_service.cc',
+      'browser/api/document_scan/document_scan_interface_nonchromeos.cc',
+    ],
+    'extensions_browser_sources_win_or_mac': [
+      'browser/api/networking_private/networking_private_event_router_nonchromeos.cc',
+      'browser/api/networking_private/networking_private_service_client.cc',
+      'browser/api/networking_private/networking_private_service_client.h',
+    ],
+    'extensions_browser_sources_linux_nonchromeos': [      
+      'browser/api/networking_private/network_config_dbus_constants_linux.cc',
+      'browser/api/networking_private/network_config_dbus_constants_linux.h',
+      'browser/api/networking_private/networking_private_event_router_nonchromeos.cc',
+      'browser/api/networking_private/networking_private_linux.cc',
+      'browser/api/networking_private/networking_private_linux.h',
+    ],
+    'extensions_renderer_sources': [
+      'renderer/activity_log_converter_strategy.cc',
+      'renderer/activity_log_converter_strategy.h',
+      'renderer/api/automation/automation_api_helper.cc',
+      'renderer/api/automation/automation_api_helper.h',
+      'renderer/api_activity_logger.cc',
+      'renderer/api_activity_logger.h',
+      'renderer/api_definitions_natives.cc',
+      'renderer/api_definitions_natives.h',
+      'renderer/app_runtime_custom_bindings.cc',
+      'renderer/app_runtime_custom_bindings.h',
+      'renderer/app_window_custom_bindings.cc',
+      'renderer/app_window_custom_bindings.h',
+      'renderer/binding_generating_native_handler.cc',
+      'renderer/binding_generating_native_handler.h',
+      'renderer/blob_native_handler.cc',
+      'renderer/blob_native_handler.h',
+      'renderer/console.cc',
+      'renderer/console.h',
+      'renderer/content_watcher.cc',
+      'renderer/content_watcher.h',
+      'renderer/context_menus_custom_bindings.cc',
+      'renderer/context_menus_custom_bindings.h',
+      'renderer/css_native_handler.cc',
+      'renderer/css_native_handler.h',
+      'renderer/dispatcher.cc',
+      'renderer/dispatcher.h',
+      'renderer/dispatcher_delegate.h',
+      'renderer/document_custom_bindings.cc',
+      'renderer/document_custom_bindings.h',
+      'renderer/dom_activity_logger.cc',
+      'renderer/dom_activity_logger.h',
+      'renderer/event_bindings.cc',
+      'renderer/event_bindings.h',
+      'renderer/extension_frame_helper.cc',
+      'renderer/extension_frame_helper.h',
+      'renderer/extension_groups.h',
+      'renderer/extension_helper.cc',
+      'renderer/extension_helper.h',
+      'renderer/extension_injection_host.cc',
+      'renderer/extension_injection_host.h',
+      'renderer/extensions_render_frame_observer.cc',
+      'renderer/extensions_render_frame_observer.h',
+      'renderer/extensions_renderer_client.cc',
+      'renderer/extensions_renderer_client.h',
+      'renderer/file_system_natives.cc',
+      'renderer/file_system_natives.h',
+      'renderer/guest_view/extensions_guest_view_container.cc',
+      'renderer/guest_view/extensions_guest_view_container.h',
+      'renderer/guest_view/guest_view_container.cc',
+      'renderer/guest_view/guest_view_container.h',
+      'renderer/guest_view/guest_view_request.cc',
+      'renderer/guest_view/guest_view_request.h',
+      'renderer/guest_view/guest_view_internal_custom_bindings.cc',
+      'renderer/guest_view/guest_view_internal_custom_bindings.h',
+      'renderer/guest_view/mime_handler_view/mime_handler_view_container.cc',
+      'renderer/guest_view/mime_handler_view/mime_handler_view_container.h',
+      'renderer/i18n_custom_bindings.cc',
+      'renderer/i18n_custom_bindings.h',
+      'renderer/id_generator_custom_bindings.cc',
+      'renderer/id_generator_custom_bindings.h',
+      'renderer/injection_host.cc',
+      'renderer/injection_host.h',
+      'renderer/lazy_background_page_native_handler.cc',
+      'renderer/lazy_background_page_native_handler.h',
+      'renderer/logging_native_handler.cc',
+      'renderer/logging_native_handler.h',
+      'renderer/messaging_bindings.cc',
+      'renderer/messaging_bindings.h',
+      'renderer/module_system.cc',
+      'renderer/module_system.h',
+      'renderer/native_handler.cc',
+      'renderer/native_handler.h',
+      'renderer/object_backed_native_handler.cc',
+      'renderer/object_backed_native_handler.h',
+      'renderer/print_native_handler.cc',
+      'renderer/print_native_handler.h',
+      'renderer/process_info_native_handler.cc',
+      'renderer/process_info_native_handler.h',
+      'renderer/programmatic_script_injector.cc',
+      'renderer/programmatic_script_injector.h',
+      'renderer/render_view_observer_natives.cc',
+      'renderer/request_sender.cc',
+      'renderer/request_sender.h',
+      'renderer/resource_bundle_source_map.cc',
+      'renderer/resource_bundle_source_map.h',
+      'renderer/resources/app_runtime_custom_bindings.js',
+      'renderer/resources/app_window_custom_bindings.js',
+      'renderer/resources/binding.js',
+      'renderer/resources/context_menus_custom_bindings.js',
+      'renderer/resources/declarative_webrequest_custom_bindings.js',
+      'renderer/resources/entry_id_manager.js',
+      'renderer/resources/event.js',
+      'renderer/resources/extension.css',
+      'renderer/resources/extension_custom_bindings.js',
+      'renderer/resources/extension_fonts.css',
+      'renderer/resources/greasemonkey_api.js',
+      'renderer/resources/i18n_custom_bindings.js',
+      'renderer/resources/image_util.js',
+      'renderer/resources/json_schema.js',
+      'renderer/resources/last_error.js',
+      'renderer/resources/messaging.js',
+      'renderer/resources/messaging_utils.js',
+      'renderer/resources/permissions_custom_bindings.js',
+      'renderer/resources/platform_app.css',
+      'renderer/resources/platform_app.js',
+      'renderer/resources/runtime_custom_bindings.js',
+      'renderer/resources/schema_utils.js',
+      'renderer/resources/send_request.js',
+      'renderer/resources/set_icon.js',
+      'renderer/resources/storage_area.js',
+      'renderer/resources/test_custom_bindings.js',
+      'renderer/resources/uncaught_exception_handler.js',
+      'renderer/resources/unload_event.js',
+      'renderer/resources/utils.js',
+      'renderer/resources/guest_view/app_view/app_view.js',
+      'renderer/resources/guest_view/extension_options/extension_options.js',
+      'renderer/resources/guest_view/extension_view/extension_view.js',
+      'renderer/resources/guest_view/surface_view/surface_view.js',
+      'renderer/resources/guest_view/web_view/web_view.js',
+      'renderer/resources/guest_view/web_view/web_view_events.js',
+      'renderer/resources/web_request_custom_bindings.js',
+      'renderer/resources/web_request_internal_custom_bindings.js',
+      'renderer/runtime_custom_bindings.cc',
+      'renderer/runtime_custom_bindings.h',
+      'renderer/safe_builtins.cc',
+      'renderer/safe_builtins.h',
+      'renderer/script_context.cc',
+      'renderer/script_context.h',
+      'renderer/script_context_set.cc',
+      'renderer/script_context_set.h',
+      'renderer/script_injection.cc',
+      'renderer/script_injection.h',
+      'renderer/script_injection_callback.cc',
+      'renderer/script_injection_callback.h',
+      'renderer/script_injection_manager.cc',
+      'renderer/script_injection_manager.h',
+      'renderer/script_injector.h',
+      'renderer/scripts_run_info.cc',
+      'renderer/scripts_run_info.h',
+      'renderer/send_request_natives.cc',
+      'renderer/send_request_natives.h',
+      'renderer/set_icon_natives.cc',
+      'renderer/set_icon_natives.h',
+      'renderer/static_v8_external_one_byte_string_resource.cc',
+      'renderer/static_v8_external_one_byte_string_resource.h',
+      'renderer/tab_finder.cc',
+      'renderer/tab_finder.h',
+      'renderer/test_features_native_handler.cc',
+      'renderer/test_features_native_handler.h',
+      'renderer/user_gestures_native_handler.cc',
+      'renderer/user_gestures_native_handler.h',
+      'renderer/user_script_injector.cc',
+      'renderer/user_script_injector.h',
+      'renderer/user_script_set.cc',
+      'renderer/user_script_set.h',
+      'renderer/user_script_set_manager.cc',
+      'renderer/user_script_set_manager.h',
+      'renderer/utils_native_handler.cc',
+      'renderer/utils_native_handler.h',
+      'renderer/v8_context_native_handler.cc',
+      'renderer/v8_context_native_handler.h',
+      'renderer/v8_schema_registry.cc',
+      'renderer/v8_schema_registry.h',
+      'renderer/web_ui_injection_host.cc',
+      'renderer/web_ui_injection_host.h',
+    ],
+    'extensions_utility_sources': [
+      'utility/unpacker.cc',
+      'utility/unpacker.h',
+      'utility/utility_handler.cc',
+      'utility/utility_handler.h',
+    ],
+    'extensions_test_support_sources': [
+      'browser/api/cast_channel/cast_test_util.cc',
+      'browser/api/cast_channel/cast_test_util.h',
+      'browser/api/dns/mock_host_resolver_creator.cc',
+      'browser/api/dns/mock_host_resolver_creator.h',
+      'browser/api/storage/settings_test_util.cc',
+      'browser/api/storage/settings_test_util.h',
+      'browser/api_test_utils.cc',
+      'browser/api_test_utils.h',
+      'browser/api_unittest.cc',
+      'browser/api_unittest.h',
+      'browser/app_window/test_app_window_contents.cc',
+      'browser/app_window/test_app_window_contents.h',
+      'browser/extension_error_test_util.cc',
+      'browser/extension_error_test_util.h',
+      'browser/extensions_test.cc',
+      'browser/extensions_test.h',
+      'browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc',
+      'browser/guest_view/mime_handler_view/test_mime_handler_view_guest.h',
+      'browser/mock_extension_system.cc',
+      'browser/mock_extension_system.h',
+      'browser/test_extension_registry_observer.cc',
+      'browser/test_extension_registry_observer.h',
+      'browser/test_extensions_browser_client.cc',
+      'browser/test_extensions_browser_client.h',
+      'browser/test_management_policy.cc',
+      'browser/test_management_policy.h',
+      'browser/test_runtime_api_delegate.cc',
+      'browser/test_runtime_api_delegate.h',
+      'common/extension_builder.cc',
+      'common/extension_builder.h',
+      'common/manifest_test.cc',
+      'common/manifest_test.h',
+      'common/permissions/permission_message_test_util.cc',
+      'common/permissions/permission_message_test_util.h',
+      'common/test_util.cc',
+      'common/test_util.h',
+      'renderer/test_extensions_renderer_client.cc',
+      'renderer/test_extensions_renderer_client.h',
+      'test/extension_test_message_listener.cc',
+      'test/extension_test_message_listener.h',
+      'test/result_catcher.cc',
+      'test/result_catcher.h',
+      'test/test_content_utility_client.cc',
+      'test/test_content_utility_client.h',
+      'test/test_extensions_client.cc',
+      'test/test_extensions_client.h',
+      'test/test_permission_message_provider.cc',
+      'test/test_permission_message_provider.h',
+    ],
+  },
+}
diff --git a/chromium/extensions/extensions_browsertests.isolate b/chromium/extensions/extensions_browsertests.isolate
new file mode 100644
index 00000000000..301e919ea48
--- /dev/null
+++ b/chromium/extensions/extensions_browsertests.isolate
@@ -0,0 +1,85 @@
+# Copyright 2015 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.
+{
+  'conditions': [
+    ['use_x11==0', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--msan=<(msan)',
+          '--tsan=<(tsan)',
+        ],
+      },
+    }],
+    ['use_x11==1', {
+      'variables': {
+        'command': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--msan=<(msan)',
+          '--tsan=<(tsan)',
+        ],
+        'files': [
+          '../testing/xvfb.py',
+        ],
+      },
+    }],
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'files': [
+          '../net/data/',
+          '../net/tools/testserver/',
+          '../testing/test_env.py',
+          '../third_party/pyftpdlib/',
+          '../third_party/pywebsocket/',
+          '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
+          'test/data/',
+        ],
+      },
+    }],
+    ['OS=="linux"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/libosmesa.so',
+        ],
+      },
+    }],
+    ['OS=="linux" and use_ozone==0', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
+    ['OS=="mac" and asan==1 and fastbuild==0', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/extensions_browsertests.dSYM/',
+        ],
+      },
+    }],
+    ['OS=="win" and target_arch=="ia32"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/wow_helper.exe',
+        ],
+      },
+    }],
+  ],
+  'includes': [
+    '../base/base.isolate',
+    '../gin/v8.isolate',
+    '../third_party/angle/angle.isolate',
+  ],
+}
diff --git a/chromium/extensions/extensions_resources.gyp b/chromium/extensions/extensions_resources.gyp
index ed81dee7d2d..5bb9a7e472f 100644
--- a/chromium/extensions/extensions_resources.gyp
+++ b/chromium/extensions/extensions_resources.gyp
@@ -11,6 +11,7 @@
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions',
       },
       'dependencies': [
+        'common/api/api.gyp:extensions_api_mojom',
         '../device/serial/serial.gyp:device_serial_mojo',
       ],
       'actions': [
diff --git a/chromium/extensions/extensions_tests.gyp b/chromium/extensions/extensions_tests.gyp
new file mode 100644
index 00000000000..3e895ca0407
--- /dev/null
+++ b/chromium/extensions/extensions_tests.gyp
@@ -0,0 +1,131 @@
+{
+  'includes': [
+    'extensions_tests.gypi',
+  ],
+  'variables': {
+    # Product name is used for Mac bundle.
+    'app_shell_product_name': 'App Shell',
+    # The version is high enough to be supported by Omaha (at least 31)
+    # but fake enough to be obviously not a Chrome release.
+    'app_shell_version': '38.1234.5678.9',
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'extensions_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:test_support_base',
+        '../components/components.gyp:keyed_service_content',
+        '../components/components.gyp:user_prefs',
+        '../content/content_shell_and_tests.gyp:test_support_content',
+        '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
+        '../device/serial/serial.gyp:device_serial',
+        '../device/serial/serial.gyp:device_serial_test_util',
+        '../mojo/mojo_base.gyp:mojo_application_bindings',
+        '../mojo/mojo_base.gyp:mojo_environment_chromium',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        'common/api/api.gyp:cast_channel_proto',
+        'extensions.gyp:extensions_browser',
+        'extensions.gyp:extensions_common',
+        'extensions.gyp:extensions_renderer',
+        'extensions.gyp:extensions_shell_and_test_pak',
+        'extensions.gyp:extensions_test_support',
+        'extensions.gyp:extensions_utility',
+        'extensions_resources.gyp:extensions_resources',
+        'extensions_strings.gyp:extensions_strings',
+      ],
+      # Needed for third_party libraries like leveldb.
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        '<@(extensions_unittests_sources)',
+      ],
+      # Disable c4267 warnings until we fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4267, ],
+      'conditions': [
+        ['OS=="win" and win_use_allocator_shim==1', {
+          'dependencies': [
+            '../base/allocator/allocator.gyp:allocator',
+          ],
+        }],
+        ['chromeos==1', {
+          'dependencies': [
+            '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support',
+          ],
+        }],
+      ],
+    },
+    {
+      # GN version: //extensions:extensions_browsertests
+      'target_name': 'extensions_browsertests',
+      'type': '<(gtest_target_type)',
+      'dependencies': [
+        'extensions.gyp:extensions_test_support',
+        'shell/app_shell.gyp:app_shell_lib',
+        # TODO(yoz): find the right deps
+        '<(DEPTH)/base/base.gyp:test_support_base',
+        '<(DEPTH)/components/components.gyp:guest_view',
+        '<(DEPTH)/components/components.gyp:guest_view_test_support',
+        '<(DEPTH)/content/content.gyp:content_app_both',
+        '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support',
+        '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
+        '<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
+        '<(DEPTH)/device/usb/usb.gyp:device_usb_mocks',
+        '<(DEPTH)/testing/gmock.gyp:gmock',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+      ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+      ],
+      'sources': [
+        '<@(extensions_browsertests_sources)',
+      ],
+      'conditions': [
+        ['OS=="win" and win_use_allocator_shim==1', {
+          'dependencies': [
+            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+          ],
+        }],
+        ['OS=="mac"', {
+          'dependencies': [
+            'shell/app_shell.gyp:app_shell',  # Needed for App Shell.app's Helper.
+          ],
+        }],
+        # This is only here to keep gyp happy. This target never builds on
+        # mobile platforms.
+        ['OS != "ios" and OS != "android"', {
+          'dependencies': [
+            '<(DEPTH)/components/components.gyp:storage_monitor_test_support',
+          ],
+        }],
+      ]
+    },
+  ],
+  'conditions': [
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'extensions_browsertests_run',
+          'type': 'none',
+          'dependencies': [
+            'extensions_browsertests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'extensions_browsertests.isolate',
+          ],
+        },
+      ],
+    }],
+  ],
+}
diff --git a/chromium/extensions/extensions_tests.gypi b/chromium/extensions/extensions_tests.gypi
new file mode 100644
index 00000000000..9220e91e348
--- /dev/null
+++ b/chromium/extensions/extensions_tests.gypi
@@ -0,0 +1,158 @@
+# Copyright 2015 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.
+
+{
+  'variables': {
+    'extensions_browsertests_sources': [
+      'browser/api/audio/audio_apitest.cc',
+      'browser/api/bluetooth_socket/bluetooth_socket_apitest.cc',
+      'browser/api/dns/dns_apitest.cc',
+      'browser/api/hid/hid_apitest.cc',
+      'browser/api/printer_provider/printer_provider_apitest.cc',
+      'browser/api/socket/socket_apitest.cc',
+      'browser/api/sockets_tcp/sockets_tcp_apitest.cc',
+      'browser/api/sockets_tcp_server/sockets_tcp_server_apitest.cc',
+      'browser/api/sockets_udp/sockets_udp_apitest.cc',
+      'browser/api/system_cpu/system_cpu_apitest.cc',
+      'browser/api/system_display/system_display_apitest.cc',
+      'browser/api/system_memory/system_memory_apitest.cc',
+      'browser/api/system_network/system_network_apitest.cc',
+      'browser/api/system_storage/storage_api_test_util.cc',
+      'browser/api/system_storage/storage_api_test_util.h',
+      'browser/api/system_storage/system_storage_apitest.cc',
+      'browser/api/system_storage/system_storage_eject_apitest.cc',
+      'browser/api/usb/usb_apitest.cc',
+      'browser/guest_view/app_view/app_view_apitest.cc',
+      'browser/guest_view/web_view/web_view_apitest.cc',
+      'browser/guest_view/web_view/web_view_apitest.h',
+      'browser/guest_view/web_view/web_view_media_access_apitest.cc',
+      'browser/updater/update_service_browsertest.cc',
+      'shell/browser/geolocation/geolocation_apitest.cc',
+      'shell/browser/shell_browsertest.cc',
+      'shell/test/shell_apitest.cc',
+      'shell/test/shell_apitest.h',
+      'shell/test/shell_test.cc',
+      'shell/test/shell_test.h',
+      'shell/test/shell_test_launcher_delegate.cc',
+      'shell/test/shell_test_launcher_delegate.h',
+      'shell/test/shell_tests_main.cc',
+    ],
+    'extensions_unittests_sources': [
+      'browser/api/alarms/alarms_api_unittest.cc',
+      'browser/api/api_resource_manager_unittest.cc',
+      'browser/api/bluetooth/bluetooth_event_router_unittest.cc',
+      'browser/api/cast_channel/cast_auth_ica_unittest.cc',
+      'browser/api/cast_channel/cast_auth_util_unittest.cc',
+      'browser/api/cast_channel/cast_channel_api_unittest.cc',
+      'browser/api/cast_channel/cast_framer_unittest.cc',
+      'browser/api/cast_channel/cast_socket_unittest.cc',
+      'browser/api/cast_channel/cast_transport_unittest.cc',
+      'browser/api/cast_channel/keep_alive_delegate_unittest.cc',
+      'browser/api/cast_channel/logger_unittest.cc',
+      'browser/api/declarative/declarative_rule_unittest.cc',
+      'browser/api/declarative/deduping_factory_unittest.cc',
+      'browser/api/declarative/rules_registry_unittest.cc',
+      'browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc',
+      'browser/api/declarative_webrequest/webrequest_condition_unittest.cc',
+      'browser/api/document_scan/document_scan_api_unittest.cc',
+      'browser/api/document_scan/document_scan_interface_chromeos_unittest.cc',
+      'browser/api/document_scan/mock_document_scan_interface.cc',
+      'browser/api/idle/idle_api_unittest.cc',
+      'browser/api/mime_handler_private/mime_handler_private_unittest.cc',
+      'browser/api/networking_config/networking_config_service_chromeos_unittest.cc',
+      'browser/api/power/power_api_unittest.cc',
+      'browser/api/sockets_tcp/sockets_tcp_api_unittest.cc',
+      'browser/api/sockets_udp/sockets_udp_api_unittest.cc',
+      'browser/api/storage/settings_quota_unittest.cc',
+      'browser/api/storage/storage_api_unittest.cc',
+      'browser/api/storage/storage_frontend_unittest.cc',
+      'browser/api/web_request/form_data_parser_unittest.cc',
+      'browser/api/web_request/upload_data_presenter_unittest.cc',
+      'browser/api/web_request/web_request_time_tracker_unittest.cc',
+      'browser/app_window/app_window_geometry_cache_unittest.cc',
+      'browser/computed_hashes_unittest.cc',
+      'browser/content_hash_tree_unittest.cc',
+      'browser/error_map_unittest.cc',
+      'browser/event_listener_map_unittest.cc',
+      'browser/event_router_unittest.cc',
+      'browser/extension_icon_image_unittest.cc',
+      'browser/extension_pref_value_map_unittest.cc',
+      'browser/extension_registry_unittest.cc',
+      'browser/file_highlighter_unittest.cc',
+      'browser/file_reader_unittest.cc',
+      'browser/image_loader_unittest.cc',
+      'browser/info_map_unittest.cc',
+      'browser/lazy_background_task_queue_unittest.cc',
+      'browser/load_monitoring_extension_host_queue_unittest.cc',
+      'browser/management_policy_unittest.cc',
+      'browser/mojo/keep_alive_impl_unittest.cc',
+      'browser/mojo/stash_backend_unittest.cc',
+      'browser/process_manager_unittest.cc',
+      'browser/process_map_unittest.cc',
+      'browser/quota_service_unittest.cc',
+      'browser/runtime_data_unittest.cc',
+      'browser/sandboxed_unpacker_unittest.cc',
+      'browser/value_store/leveldb_value_store_unittest.cc',
+      'browser/value_store/testing_value_store_unittest.cc',
+      'browser/value_store/value_store_change_unittest.cc',
+      'browser/value_store/value_store_frontend_unittest.cc',
+      'browser/value_store/value_store_unittest.cc',
+      'browser/value_store/value_store_unittest.h',
+      'browser/verified_contents_unittest.cc',
+      'browser/warning_service_unittest.cc',
+      'common/api/printer_provider/usb_printer_manifest_unittest.cc',
+      'common/api/sockets/sockets_manifest_permission_unittest.cc',
+      'common/csp_validator_unittest.cc',
+      'common/event_filter_unittest.cc',
+      'common/extension_l10n_util_unittest.cc',
+      'common/extension_resource_unittest.cc',
+      'common/extension_set_unittest.cc',
+      'common/features/base_feature_provider_unittest.cc',
+      'common/features/complex_feature_unittest.cc',
+      'common/features/simple_feature_unittest.cc',
+      'common/file_util_unittest.cc',
+      'common/image_util_unittest.cc',
+      'common/manifest_handler_unittest.cc',
+      'common/manifest_handlers/content_capabilities_manifest_unittest.cc',
+      'common/manifest_handlers/default_locale_manifest_unittest.cc',
+      'common/manifest_handlers/externally_connectable_unittest.cc',
+      'common/manifest_handlers/file_handler_manifest_unittest.cc',
+      'common/manifest_handlers/oauth2_manifest_unittest.cc',
+      'common/manifest_handlers/shared_module_manifest_unittest.cc',
+      'common/message_bundle_unittest.cc',
+      'common/one_shot_event_unittest.cc',
+      'common/permissions/api_permission_set_unittest.cc',
+      'common/permissions/manifest_permission_set_unittest.cc',
+      'common/permissions/socket_permission_unittest.cc',
+      'common/permissions/usb_device_permission_unittest.cc',
+      'common/stack_frame_unittest.cc',
+      'common/url_pattern_set_unittest.cc',
+      'common/url_pattern_unittest.cc',
+      'common/user_script_unittest.cc',
+      'renderer/activity_log_converter_strategy_unittest.cc',
+      'renderer/api/mojo_private/mojo_private_unittest.cc',
+      'renderer/api/serial/data_receiver_unittest.cc',
+      'renderer/api/serial/data_sender_unittest.cc',
+      'renderer/api/serial/serial_api_unittest.cc',
+      'renderer/api_test_base.cc',
+      'renderer/api_test_base.h',
+      'renderer/api_test_base_unittest.cc',
+      'renderer/event_unittest.cc',
+      'renderer/json_schema_unittest.cc',
+      'renderer/messaging_utils_unittest.cc',
+      'renderer/module_system_test.cc',
+      'renderer/module_system_test.h',
+      'renderer/module_system_unittest.cc',
+      'renderer/mojo/keep_alive_client_unittest.cc',
+      'renderer/mojo/stash_client_unittest.cc',
+      'renderer/safe_builtins_unittest.cc',
+      'renderer/script_context_set_unittest.cc',
+      'renderer/script_context_unittest.cc',
+      'renderer/utils_unittest.cc',
+      'shell/browser/shell_web_contents_modal_dialog_manager.cc',
+      'test/extensions_unittests_main.cc',
+      'utility/unpacker_unittest.cc',
+    ],
+  },
+}
diff --git a/chromium/extensions/shell/app_shell.gyp b/chromium/extensions/shell/app_shell.gyp
index 2682d5e99d1..25bd151ab8e 100644
--- a/chromium/extensions/shell/app_shell.gyp
+++ b/chromium/extensions/shell/app_shell.gyp
@@ -3,23 +3,33 @@
 # found in the LICENSE file.
 
 {
+  'includes': [
+    'app_shell.gypi',
+  ],
   'variables': {
+    # Product name is used for Mac bundle.
+    'app_shell_product_name': 'App Shell',
+    # The version is high enough to be supported by Omaha (at least 31)
+    # but fake enough to be obviously not a Chrome release.
+    'app_shell_version': '38.1234.5678.9',
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'app_shell_lib',
       'type': 'static_library',
-      'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         'app_shell_version_header',
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_prefs_test_support',
-        '<(DEPTH)/components/components.gyp:omaha_query_params',
+        '<(DEPTH)/base/base.gyp:base_prefs',
+        '<(DEPTH)/components/components.gyp:devtools_discovery',
+        '<(DEPTH)/components/components.gyp:devtools_http_handler',
         '<(DEPTH)/components/components.gyp:pref_registry',
+        '<(DEPTH)/components/components.gyp:update_client',
         '<(DEPTH)/components/components.gyp:user_prefs',
         '<(DEPTH)/components/components.gyp:web_cache_renderer',
         '<(DEPTH)/content/content.gyp:content',
+        '<(DEPTH)/content/content.gyp:content_browser',
         '<(DEPTH)/content/content.gyp:content_gpu',
         '<(DEPTH)/content/content.gyp:content_ppapi_plugin',
         '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_lib',
@@ -35,101 +45,43 @@
         '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
         '<(DEPTH)/extensions/shell/browser/api/api_registration.gyp:shell_api_registration',
         '<(DEPTH)/extensions/shell/common/api/api.gyp:shell_api',
-        '<(DEPTH)/mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-        '<(DEPTH)/ui/wm/wm.gyp:wm',
+        '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '<(DEPTH)/ui/base/ime/ui_base_ime.gyp:ui_base_ime',
+        '<(DEPTH)/ui/base/ui_base.gyp:ui_base',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
+      'export_dependent_settings': [
+        '<(DEPTH)/content/content.gyp:content_browser',
+      ],
       'include_dirs': [
         '../..',
         '<(SHARED_INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/extensions/shell',
       ],
       'sources': [
-        'app/shell_main_delegate.cc',
-        'app/shell_main_delegate.h',
-        'browser/api/identity/identity_api.cc',
-        'browser/api/identity/identity_api.h',
-        'browser/api/shell_gcd/shell_gcd_api.cc',
-        'browser/api/shell_gcd/shell_gcd_api.h',
-        'browser/api/shell_window/shell_window_api.cc',
-        'browser/api/shell_window/shell_window_api.h',
-        'browser/shell_browser_context_keyed_service_factories.cc',
-        'browser/shell_browser_context_keyed_service_factories.h',
-        'browser/default_shell_browser_main_delegate.cc',
-        'browser/default_shell_browser_main_delegate.h',
-        'browser/desktop_controller.cc',
-        'browser/desktop_controller.h',
-        'browser/media_capture_util.cc',
-        'browser/media_capture_util.h',
-        'browser/shell_app_delegate.cc',
-        'browser/shell_app_delegate.h',
-        'browser/shell_app_window_client.cc',
-        'browser/shell_app_window_client.h',
-        'browser/shell_audio_controller_chromeos.cc',
-        'browser/shell_audio_controller_chromeos.h',
-        'browser/shell_browser_context.cc',
-        'browser/shell_browser_context.h',
-        'browser/shell_browser_main_delegate.h',
-        'browser/shell_browser_main_parts.cc',
-        'browser/shell_browser_main_parts.h',
-        'browser/shell_content_browser_client.cc',
-        'browser/shell_content_browser_client.h',
-        'browser/shell_desktop_controller.cc',
-        'browser/shell_desktop_controller.h',
-        'browser/shell_device_client.cc',
-        'browser/shell_device_client.h',
-        'browser/shell_display_info_provider.cc',
-        'browser/shell_display_info_provider.h',
-        'browser/shell_extension_host_delegate.cc',
-        'browser/shell_extension_host_delegate.h',
-        'browser/shell_extension_system.cc',
-        'browser/shell_extension_system.h',
-        'browser/shell_extension_system_factory.cc',
-        'browser/shell_extension_system_factory.h',
-        'browser/shell_extension_web_contents_observer.cc',
-        'browser/shell_extension_web_contents_observer.h',
-        'browser/shell_extensions_browser_client.cc',
-        'browser/shell_extensions_browser_client.h',
-        'browser/shell_native_app_window.cc',
-        'browser/shell_native_app_window.h',
-        'browser/shell_network_controller_chromeos.cc',
-        'browser/shell_network_controller_chromeos.h',
-        'browser/shell_network_delegate.cc',
-        'browser/shell_network_delegate.h',
-        'browser/shell_oauth2_token_service.cc',
-        'browser/shell_oauth2_token_service.h',
-        'browser/shell_omaha_query_params_delegate.cc',
-        'browser/shell_omaha_query_params_delegate.h',
-        'browser/shell_runtime_api_delegate.cc',
-        'browser/shell_runtime_api_delegate.h',
-        'browser/shell_special_storage_policy.cc',
-        'browser/shell_special_storage_policy.h',
-        'browser/shell_url_request_context_getter.cc',
-        'browser/shell_url_request_context_getter.h',
-        'browser/shell_web_contents_modal_dialog_manager.cc',
-        'common/shell_content_client.cc',
-        'common/shell_content_client.h',
-        'common/shell_extensions_client.cc',
-        'common/shell_extensions_client.h',
-        'common/switches.cc',
-        'common/switches.h',
-        'renderer/shell_content_renderer_client.cc',
-        'renderer/shell_content_renderer_client.h',
-        'renderer/shell_extensions_renderer_client.cc',
-        'renderer/shell_extensions_renderer_client.h',
-        'utility/shell_content_utility_client.cc',
-        'utility/shell_content_utility_client.h',
+        '<@(app_shell_lib_sources)',
       ],
       'conditions': [
+        ['use_aura==1', {
+          'dependencies': [
+            '<(DEPTH)/ui/wm/wm.gyp:wm',
+          ],
+          'sources': [
+            '<@(app_shell_lib_sources_aura)',
+          ],
+        }],
         ['chromeos==1', {
           'dependencies': [
             '<(DEPTH)/chromeos/chromeos.gyp:chromeos',
             '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos',
             '<(DEPTH)/ui/display/display.gyp:display',
           ],
+          'sources': [
+            '<@(app_shell_lib_sources_chromeos)',
+          ],
         }],
         ['disable_nacl==0 and OS=="linux"', {
           'dependencies': [
@@ -145,8 +97,7 @@
             '<(DEPTH)/components/nacl.gyp:nacl_switches',
           ],
           'sources': [
-            'browser/shell_nacl_browser_delegate.cc',
-            'browser/shell_nacl_browser_delegate.h',
+            '<@(app_shell_lib_sources_nacl)',
           ],
         }],
       ],
@@ -154,7 +105,7 @@
     {
       'target_name': 'app_shell',
       'type': 'executable',
-      'defines!': ['CONTENT_IMPLEMENTATION'],
+      'mac_bundle': 1,
       'dependencies': [
         'app_shell_lib',
         '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
@@ -163,7 +114,7 @@
         '../..',
       ],
       'sources': [
-        'app/shell_main.cc',
+        '<@(app_shell_sources)',
       ],
       'conditions': [
         ['OS=="win"', {
@@ -181,53 +132,73 @@
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
-      ],
-    },
-    {
-      'target_name': 'app_shell_browsertests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        'app_shell_lib',
-        # TODO(yoz): find the right deps
-        '<(DEPTH)/base/base.gyp:test_support_base',
-        '<(DEPTH)/content/content.gyp:content_app_both',
-        '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support',
-        '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
-        '<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
-        '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-      ],
-      'defines': [
-        'HAS_OUT_OF_PROC_TEST_RUNNER',
-      ],
-      'sources': [
-        # TODO(yoz): Refactor once we have a second test target.
-        # TODO(yoz): Something is off here; should this .gyp file be
-        # in the parent directory? Test target extensions_browsertests?
-        '../browser/api/dns/dns_apitest.cc',
-        '../browser/api/hid/hid_apitest.cc',
-        '../browser/api/socket/socket_apitest.cc',
-        '../browser/api/sockets_tcp/sockets_tcp_apitest.cc',
-        '../browser/api/sockets_udp/sockets_udp_apitest.cc',
-        '../browser/api/usb/usb_apitest.cc',
-        '../browser/guest_view/app_view/app_view_apitest.cc',
-        '../browser/guest_view/web_view/web_view_apitest.h',
-        '../browser/guest_view/web_view/web_view_apitest.cc',
-        '../browser/guest_view/web_view/web_view_media_access_apitest.cc',
-        '../browser/updater/update_service_browsertest.cc',
-        'browser/shell_browsertest.cc',
-        'test/shell_apitest.cc',
-        'test/shell_apitest.h',
-        'test/shell_test.cc',
-        'test/shell_test.h',
-        'test/shell_test_launcher_delegate.cc',
-        'test/shell_test_launcher_delegate.h',
-        'test/shell_tests_main.cc',
-      ],
-      'conditions': [
-        ['OS=="win" and win_use_allocator_shim==1', {
+        ['OS=="mac"', {
+          'product_name': '<(app_shell_product_name)',
+          'dependencies!': [
+            'app_shell_lib',
+          ],
           'dependencies': [
-            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+            'app_shell_framework',
+            'app_shell_helper',
+          ],
+          'mac_bundle_resources': [
+            'app/app-Info.plist',
+          ],
+          # TODO(mark): Come up with a fancier way to do this.  It should only
+          # be necessary to list app-Info.plist once, not the three times it is
+          # listed here.
+          'mac_bundle_resources!': [
+            'app/app-Info.plist',
+          ],
+          'xcode_settings': {
+            'INFOPLIST_FILE': 'app/app-Info.plist',
+          },
+          'copies': [{
+              'destination': '<(PRODUCT_DIR)/<(app_shell_product_name).app/Contents/Frameworks',
+              'files': [
+                '<(PRODUCT_DIR)/<(app_shell_product_name) Helper.app',
+              ],
+          }],
+          'postbuilds': [
+            {
+              'postbuild_name': 'Copy <(app_shell_product_name) Framework.framework',
+              'action': [
+                '../../build/mac/copy_framework_unversioned.sh',
+                '${BUILT_PRODUCTS_DIR}/<(app_shell_product_name) Framework.framework',
+                '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Frameworks',
+              ],
+            },
+            {
+              # Modify the Info.plist as needed.
+              'postbuild_name': 'Tweak Info.plist',
+              'action': ['../../build/mac/tweak_info_plist.py',
+                         '--scm=1',
+                         '--version=<(app_shell_version)'],
+            },
+            {
+              # This postbuild step is responsible for creating the following
+              # helpers:
+              #
+              # App Shell Helper EH.app and App Shell Helper NP.app are
+              # created from App Shell Helper.app.
+              #
+              # The EH helper is marked for an executable heap. The NP helper
+              # is marked for no PIE (ASLR).
+              'postbuild_name': 'Make More Helpers',
+              'action': [
+                '../../build/mac/make_more_helpers.sh',
+                'Frameworks',
+                '<(app_shell_product_name)',
+              ],
+            },
+            {
+              # Make sure there isn't any Objective-C in the shell's
+              # executable.
+              'postbuild_name': 'Verify No Objective-C',
+              'action': [
+                '../../build/mac/verify_no_objc.sh',
+              ],
+            },
           ],
         }],
       ],
@@ -244,29 +215,31 @@
         '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
         '<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
         '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/ui/aura/aura.gyp:aura_test_support',
       ],
       'sources': [
-        '../test/extensions_unittests_main.cc',
-        'browser/api/identity/identity_api_unittest.cc',
-        'browser/api/shell_gcd/shell_gcd_api_unittest.cc',
-        'browser/api/shell_window/shell_window_api_unittest.cc',
-        'browser/shell_audio_controller_chromeos_unittest.cc',
-        'browser/shell_desktop_controller_unittest.cc',
-        'browser/shell_nacl_browser_delegate_unittest.cc',
-        'browser/shell_oauth2_token_service_unittest.cc',
-        'common/shell_content_client_unittest.cc'
+        '<@(app_shell_unittests_sources)',
       ],
       'conditions': [
-        ['disable_nacl==1', {
-          'sources!': [
-            'browser/shell_nacl_browser_delegate_unittest.cc',
+        ['disable_nacl==0', {
+          'sources': [
+            '<@(app_shell_unittests_sources_nacl)',
+          ],
+        }],
+        ['use_aura==1', {
+          'sources': [
+            '<@(app_shell_unittests_sources_aura)',
+          ],
+          'dependencies': [
+            '<(DEPTH)/ui/aura/aura.gyp:aura_test_support',
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
           ],
+          'sources': [
+            '<@(app_shell_unittests_sources_chromeos)',
+          ],
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
@@ -313,4 +286,143 @@
       ],
     },
   ],  # targets
+
+  'conditions': [
+    ['OS=="mac"', {
+      'targets': [
+        {
+          'target_name': 'app_shell_framework',
+          'type': 'shared_library',
+          'product_name': '<(app_shell_product_name) Framework',
+          'mac_bundle': 1,
+          'mac_bundle_resources': [
+            '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
+            'app/framework-Info.plist',
+          ],
+          'mac_bundle_resources!': [
+            'app/framework-Info.plist',
+          ],
+          'xcode_settings': {
+            # The framework is placed within the .app's Framework
+            # directory.  DYLIB_INSTALL_NAME_BASE and
+            # LD_DYLIB_INSTALL_NAME affect -install_name.
+            'DYLIB_INSTALL_NAME_BASE':
+                '@executable_path/../Frameworks',
+            # See /build/mac/copy_framework_unversioned.sh for
+            # information on LD_DYLIB_INSTALL_NAME.
+            'LD_DYLIB_INSTALL_NAME':
+                '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(WRAPPER_NAME)/$(PRODUCT_NAME)',
+
+            'INFOPLIST_FILE': 'app/framework-Info.plist',
+          },
+          'dependencies': [
+            'app_shell_lib',
+          ],
+          'include_dirs': [
+            '../..',
+          ],
+          'sources': [
+            '<@(app_shell_sources_mac)',
+          ],
+          'postbuilds': [
+            {
+              # Modify the Info.plist as needed.  The script explains why
+              # this is needed.  This is also done in the chrome target.
+              # The framework needs the Breakpad keys if this feature is
+              # enabled.  It does not need the Keystone keys; these always
+              # come from the outer application bundle.  The framework
+              # doesn't currently use the SCM keys for anything,
+              # but this seems like a really good place to store them.
+              'postbuild_name': 'Tweak Info.plist',
+              'action': ['../../build/mac/tweak_info_plist.py',
+                         '--breakpad=1',
+                         '--keystone=0',
+                         '--scm=1',
+                         '--version=<(app_shell_version)',
+                         '--branding=<(app_shell_product_name)'],
+            },
+          ],
+          'conditions': [
+            ['icu_use_data_file_flag==1', {
+              'mac_bundle_resources': [
+                '<(PRODUCT_DIR)/icudtl.dat',
+              ],
+            }],
+            ['v8_use_external_startup_data==1', {
+              'mac_bundle_resources': [
+                '<(PRODUCT_DIR)/natives_blob.bin',
+                '<(PRODUCT_DIR)/snapshot_blob.bin',
+              ],
+            }],
+          ],
+        },  # target app_shell_framework
+        {
+          'target_name': 'app_shell_helper',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'product_name': '<(app_shell_product_name) Helper',
+          'mac_bundle': 1,
+          'dependencies': [
+            'app_shell_framework',
+          ],
+          'sources': [
+            'app/shell_main.cc',
+            'app/helper-Info.plist',
+          ],
+          # TODO(mark): Come up with a fancier way to do this.  It should only
+          # be necessary to list helper-Info.plist once, not the three times it
+          # is listed here.
+          'mac_bundle_resources!': [
+            'app/helper-Info.plist',
+          ],
+          # TODO(mark): For now, don't put any resources into this app.  Its
+          # resources directory will be a symbolic link to the browser app's
+          # resources directory.
+          'mac_bundle_resources/': [
+            ['exclude', '.*'],
+          ],
+          'xcode_settings': {
+            'INFOPLIST_FILE': 'app/helper-Info.plist',
+          },
+          'postbuilds': [
+            {
+              # The framework defines its load-time path
+              # (DYLIB_INSTALL_NAME_BASE) relative to the main executable
+              # (chrome).  A different relative path needs to be used in
+              # helper_app.
+              'postbuild_name': 'Fix Framework Link',
+              'action': [
+                'install_name_tool',
+                '-change',
+                '@executable_path/../Frameworks/<(app_shell_product_name) Framework.framework/<(app_shell_product_name) Framework',
+                '@executable_path/../../../<(app_shell_product_name) Framework.framework/<(app_shell_product_name) Framework',
+                '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
+              ],
+            },
+            {
+              # Modify the Info.plist as needed.  The script explains why this
+              # is needed.  This is also done in the chrome and chrome_dll
+              # targets.  In this case, --breakpad=0, --keystone=0, and --scm=0
+              # are used because Breakpad, Keystone, and SCM keys are
+              # never placed into the helper.
+              'postbuild_name': 'Tweak Info.plist',
+              'action': ['../../build/mac/tweak_info_plist.py',
+                         '--breakpad=0',
+                         '--keystone=0',
+                         '--scm=0',
+                         '--version=<(app_shell_version)'],
+            },
+            {
+              # Make sure there isn't any Objective-C in the helper app's
+              # executable.
+              'postbuild_name': 'Verify No Objective-C',
+              'action': [
+                '../../build/mac/verify_no_objc.sh',
+              ],
+            },
+          ],
+        },  # target app_shell_helper
+      ],
+    }],  # OS=="mac"
+  ],
 }
diff --git a/chromium/extensions/shell/app_shell.gypi b/chromium/extensions/shell/app_shell.gypi
new file mode 100644
index 00000000000..4c6bc8d0a81
--- /dev/null
+++ b/chromium/extensions/shell/app_shell.gypi
@@ -0,0 +1,136 @@
+# Copyright 2015 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.
+
+{
+  'variables': {
+    'app_shell_lib_sources': [
+      'app/paths_mac.h',
+      'app/paths_mac.mm',
+      'app/shell_main_delegate.cc',
+      'app/shell_main_delegate.h',
+      'browser/api/identity/identity_api.cc',
+      'browser/api/identity/identity_api.h',
+      'browser/default_shell_browser_main_delegate.cc',
+      'browser/default_shell_browser_main_delegate.h',
+      'browser/desktop_controller.cc',
+      'browser/desktop_controller.h',
+      'browser/media_capture_util.cc',
+      'browser/media_capture_util.h',
+      'browser/shell_app_delegate.cc',
+      'browser/shell_app_delegate.h',
+      'browser/shell_app_view_guest_delegate.cc',
+      'browser/shell_app_view_guest_delegate.h',
+      'browser/shell_app_window_client.cc',
+      'browser/shell_app_window_client.h',
+      'browser/shell_app_window_client_mac.mm',
+      'browser/shell_audio_controller_chromeos.cc',
+      'browser/shell_audio_controller_chromeos.h',
+      'browser/shell_browser_context.cc',
+      'browser/shell_browser_context.h',
+      'browser/shell_browser_context_keyed_service_factories.cc',
+      'browser/shell_browser_context_keyed_service_factories.h',
+      'browser/shell_browser_main_delegate.h',
+      'browser/shell_browser_main_parts.cc',
+      'browser/shell_browser_main_parts.h',
+      'browser/shell_browser_main_parts_mac.h',
+      'browser/shell_browser_main_parts_mac.mm',
+      'browser/shell_content_browser_client.cc',
+      'browser/shell_content_browser_client.h',
+      'browser/shell_desktop_controller_mac.h',
+      'browser/shell_desktop_controller_mac.mm',
+      'browser/shell_device_client.cc',
+      'browser/shell_device_client.h',
+      'browser/shell_display_info_provider.cc',
+      'browser/shell_display_info_provider.h',
+      'browser/shell_extension_host_delegate.cc',
+      'browser/shell_extension_host_delegate.h',
+      'browser/shell_extension_system.cc',
+      'browser/shell_extension_system.h',
+      'browser/shell_extension_system_factory.cc',
+      'browser/shell_extension_system_factory.h',
+      'browser/shell_extension_web_contents_observer.cc',
+      'browser/shell_extension_web_contents_observer.h',
+      'browser/shell_extensions_api_client.cc',
+      'browser/shell_extensions_api_client.h',
+      'browser/shell_extensions_browser_client.cc',
+      'browser/shell_extensions_browser_client.h',
+      'browser/shell_native_app_window.cc',
+      'browser/shell_native_app_window.h',
+      'browser/shell_native_app_window_mac.h',
+      'browser/shell_native_app_window_mac.mm',
+      'browser/shell_network_controller_chromeos.cc',
+      'browser/shell_network_controller_chromeos.h',
+      'browser/shell_network_delegate.cc',
+      'browser/shell_network_delegate.h',
+      'browser/shell_oauth2_token_service.cc',
+      'browser/shell_oauth2_token_service.h',
+      'browser/shell_prefs.cc',
+      'browser/shell_prefs.h',
+      'browser/shell_runtime_api_delegate.cc',
+      'browser/shell_runtime_api_delegate.h',
+      'browser/shell_special_storage_policy.cc',
+      'browser/shell_special_storage_policy.h',
+      'browser/shell_speech_recognition_manager_delegate.cc',
+      'browser/shell_speech_recognition_manager_delegate.h',
+      'browser/shell_update_query_params_delegate.cc',
+      'browser/shell_update_query_params_delegate.h',
+      'browser/shell_url_request_context_getter.cc',
+      'browser/shell_url_request_context_getter.h',
+      'browser/shell_web_contents_modal_dialog_manager.cc',
+      'common/shell_content_client.cc',
+      'common/shell_content_client.h',
+      'common/shell_extensions_client.cc',
+      'common/shell_extensions_client.h',
+      'common/switches.cc',
+      'common/switches.h',
+      'renderer/shell_content_renderer_client.cc',
+      'renderer/shell_content_renderer_client.h',
+      'renderer/shell_extensions_renderer_client.cc',
+      'renderer/shell_extensions_renderer_client.h',
+      'utility/shell_content_utility_client.cc',
+      'utility/shell_content_utility_client.h',
+    ],
+    'app_shell_lib_sources_aura': [
+      'browser/shell_app_window_client_aura.cc',
+      'browser/shell_desktop_controller_aura.cc',
+      'browser/shell_desktop_controller_aura.h',
+      'browser/shell_native_app_window_aura.cc',
+      'browser/shell_native_app_window_aura.h',
+      'browser/shell_screen.cc',
+      'browser/shell_screen.h',
+    ],
+    'app_shell_lib_sources_chromeos': [
+      'browser/api/vpn_provider/vpn_service_factory.cc',
+    ],
+    'app_shell_lib_sources_nacl': [
+      'browser/shell_nacl_browser_delegate.cc',
+      'browser/shell_nacl_browser_delegate.h',
+    ],
+    'app_shell_sources': [
+      'app/shell_main.cc',
+    ],
+    'app_shell_sources_mac': [
+      'app/shell_main_mac.cc',
+      'app/shell_main_mac.h',
+    ],
+    'app_shell_unittests_sources': [
+      '../test/extensions_unittests_main.cc',
+      'browser/api/identity/identity_api_unittest.cc',
+      'browser/shell_oauth2_token_service_unittest.cc',
+      'browser/shell_prefs_unittest.cc',
+      'common/shell_content_client_unittest.cc',
+    ],
+    'app_shell_unittests_sources_aura': [
+      'browser/shell_desktop_controller_aura_unittest.cc',
+      'browser/shell_native_app_window_aura_unittest.cc',
+      'browser/shell_screen_unittest.cc',
+    ],
+    'app_shell_unittests_sources_chromeos': [
+      'browser/shell_audio_controller_chromeos_unittest.cc',
+    ],
+    'app_shell_unittests_sources_nacl': [
+      'browser/shell_nacl_browser_delegate_unittest.cc',
+    ],
+  },
+}
diff --git a/chromium/extensions/shell/common/api/schemas.gypi b/chromium/extensions/shell/common/api/schemas.gypi
index d2b0da8662a..f257f9b6229 100644
--- a/chromium/extensions/shell/common/api/schemas.gypi
+++ b/chromium/extensions/shell/common/api/schemas.gypi
@@ -7,16 +7,26 @@
     '<@(schema_files)',
   ],
   'variables': {
-    'chromium_code': 1,
-    'non_compiled_schema_files': [
-    ],
     'schema_files': [
       'identity.idl',
-      'shell_gcd.idl',
-      'shell_window.idl',
     ],
+    'non_compiled_schema_files': [
+    ],
+    # Chrome OS specific APIs.
+    'chromeos_schema_files': [
+    ],
+    
+    'chromium_code': 1,
     'cc_dir': 'extensions/shell/common/api',
     'root_namespace': 'extensions::shell::api::%(namespace)s',
     'impl_dir_': 'extensions/shell/browser/api',
+    
+    'conditions': [
+      ['chromeos==1', {
+        'schema_files': [
+          '<@(chromeos_schema_files)',
+        ],
+      }],
+    ],
   },
 }