Initial import.

61 files changed, 24858 insertions, 0 deletions

diff --git a/chromium/chrome/app/policy/cloud_policy_codegen.gyp b/chromium/chrome/app/policy/cloud_policy_codegen.gyp
new file mode 100644
index 00000000000..963d7f59508
--- /dev/null
+++ b/chromium/chrome/app/policy/cloud_policy_codegen.gyp
@@ -0,0 +1,173 @@
+# Copyright (c) 2012 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': {
+    'chromium_code': 1,
+    'policy_out_dir': '<(SHARED_INTERMEDIATE_DIR)/policy',
+    'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
+    'generate_policy_source_script_path':
+        '<(DEPTH)/chrome/tools/build/generate_policy_source.py',
+    'policy_constant_header_path':
+        '<(policy_out_dir)/policy/policy_constants.h',
+    'policy_constant_source_path':
+        '<(policy_out_dir)/policy/policy_constants.cc',
+    'protobuf_decoder_path':
+        '<(policy_out_dir)/policy/cloud_policy_generated.cc',
+    # This is the "full" protobuf, which defines one protobuf message per
+    # policy. It is also the format currently used by the server.
+    'chrome_settings_proto_path':
+        '<(policy_out_dir)/policy/chrome_settings.proto',
+    # This protobuf is equivalent to chrome_settings.proto but shares messages
+    # for policies of the same type, so that less classes have to be generated
+    # and compiled.
+    'cloud_policy_proto_path': '<(policy_out_dir)/policy/cloud_policy.proto',
+  },
+  'targets': [
+    {
+      'target_name': 'cloud_policy_code_generate',
+      'type': 'none',
+      'actions': [
+        {
+          'inputs': [
+            'policy_templates.json',
+            '<(generate_policy_source_script_path)',
+          ],
+          'outputs': [
+            '<(policy_constant_header_path)',
+            '<(policy_constant_source_path)',
+            '<(protobuf_decoder_path)',
+            '<(chrome_settings_proto_path)',
+            '<(cloud_policy_proto_path)',
+          ],
+          'action_name': 'generate_policy_source',
+          'action': [
+            'python',
+            '<@(generate_policy_source_script_path)',
+            '--policy-constants-header=<(policy_constant_header_path)',
+            '--policy-constants-source=<(policy_constant_source_path)',
+            '--chrome-settings-protobuf=<(chrome_settings_proto_path)',
+            '--cloud-policy-protobuf=<(cloud_policy_proto_path)',
+            '--cloud-policy-decoder=<(protobuf_decoder_path)',
+            '<(OS)',
+            '<(chromeos)',
+            'policy_templates.json',
+          ],
+          'message': 'Generating policy source',
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(policy_out_dir)',
+          '<(protoc_out_dir)',
+        ],
+      },
+    },
+    {
+      'target_name': 'cloud_policy_proto_generated_compile',
+      'type': 'static_library',
+      'sources': [
+        '<(cloud_policy_proto_path)',
+      ],
+      'variables': {
+        'proto_in_dir': '<(policy_out_dir)/policy',
+        'proto_out_dir': 'policy/proto',
+      },
+      'dependencies': [
+        'cloud_policy_code_generate',
+      ],
+      'includes': [ '../../../build/protoc.gypi' ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [4267, ],
+    },
+    {
+      # This target builds the "full" protobuf, used for tests only.
+      'target_name': 'chrome_settings_proto_generated_compile',
+      'type': 'static_library',
+      'sources': [
+        '<(chrome_settings_proto_path)',
+      ],
+      'variables': {
+        'proto_in_dir': '<(policy_out_dir)/policy',
+        'proto_out_dir': 'policy/proto',
+      },
+      'dependencies': [
+        'cloud_policy_code_generate',
+        'cloud_policy_proto_generated_compile',
+      ],
+      'includes': [ '../../../build/protoc.gypi' ],
+    },
+    {
+      'target_name': 'policy',
+      'type': 'static_library',
+      'hard_dependency': 1,
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(policy_out_dir)',
+          '<(protoc_out_dir)',
+        ],
+      },
+      'sources': [
+        '<(policy_constant_header_path)',
+        '<(policy_constant_source_path)',
+        '<(protobuf_decoder_path)',
+      ],
+      'include_dirs': [
+        '<(DEPTH)',
+      ],
+      'dependencies': [
+        'cloud_policy_code_generate',
+        'cloud_policy_proto_generated_compile',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
+      ],
+    },
+    {
+      'target_name': 'policy_test_support',
+      'type': 'none',
+      'hard_dependency': 1,
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(policy_out_dir)',
+          '<(protoc_out_dir)',
+        ],
+      },
+      'dependencies': [
+        'policy',
+        'chrome_settings_proto_generated_compile',
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
+          'target_name': 'policy_win64',
+          'type': 'static_library',
+          'hard_dependency': 1,
+          'sources': [
+            '<(policy_constant_header_path)',
+            '<(policy_constant_source_path)',
+          ],
+          'include_dirs': [
+            '<(DEPTH)',
+          ],
+          'direct_dependent_settings':  {
+            'include_dirs': [
+              '<(policy_out_dir)'
+            ],
+          },
+          'dependencies': [
+            'cloud_policy_code_generate',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+        },
+      ],
+    }],
+  ],  # 'conditions'
+}
diff --git a/chromium/chrome/app/policy/policy_templates.gypi b/chromium/chrome/app/policy/policy_templates.gypi
new file mode 100644
index 00000000000..467f65b4c5f
--- /dev/null
+++ b/chromium/chrome/app/policy/policy_templates.gypi
@@ -0,0 +1,168 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'conditions': [
+    ['OS=="win" or OS=="mac" or OS=="linux"', {
+      'targets': [
+        {
+          # policy_templates has different inputs and outputs, so it can't use
+          # the rules of chrome_strings
+          'target_name': 'policy_templates',
+          'type': 'none',
+          'variables': {
+            'grit_grd_file': 'policy_templates.grd',
+            'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py',
+                              '<@(grit_defines)'],
+          },
+          'includes': [ '../../../build/grit_target.gypi' ],
+          'actions': [
+            {
+              'action_name': 'policy_templates',
+              'includes': [ '../../../build/grit_action.gypi' ],
+            },
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'variables': {
+                'version_path': '<(grit_out_dir)/app/policy/VERSION',
+                'template_files': [
+                  '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(grit_grd_file))'
+                ],
+              },
+              'actions': [
+                {
+                  'action_name': 'add_version',
+                  'inputs': ['../../VERSION'],
+                  'outputs': ['<(version_path)'],
+                  'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+                  'msvs_cygwin_shell': 1,
+                },
+                {
+                  # Add all the templates generated at the previous step into
+                  # a zip archive.
+                  'action_name': 'pack_templates',
+                  'variables': {
+                    'zip_script':
+                        'tools/build/win/make_policy_zip.py'
+                  },
+                  'inputs': [
+                    '<(version_path)',
+                    '<@(template_files)',
+                    '<(zip_script)'
+                  ],
+                  'outputs': [
+                    '<(PRODUCT_DIR)/policy_templates.zip'
+                  ],
+                  'action': [
+                    'python',
+                    '<(zip_script)',
+                    '--output',
+                    '<@(_outputs)',
+                    '--basedir', '<(grit_out_dir)/app/policy',
+                    # The list of files in the destination zip is derived from
+                    # the list of output nodes in the following grd file.
+                    # This whole trickery is necessary because we cannot pass
+                    # the entire list of file names as command line arguments,
+                    # because they would exceed the length limit on Windows.
+                    '--grd_input',
+                    '<(grit_grd_file)',
+                    '--grd_strip_path_prefix',
+                    'app/policy',
+                    '--extra_input',
+                    'VERSION',
+                    # Module to be used to process grd_input'.
+                    '--grit_info',
+                    '<(DEPTH)/tools/grit/grit_info.py',
+                    '<@(grit_defines)',
+                  ],
+                  'message': 'Packing generated templates into <(_outputs)',
+                  'msvs_cygwin_shell': 1,
+                }
+              ]
+            }],
+          ],  # conditions
+        },
+      ],  # 'targets'
+    }],  # OS=="win" or OS=="mac" or OS=="linux"
+    ['OS=="mac"', {
+      'targets': [
+        {
+          # This is the bundle of the manifest file of Chrome.
+          # It contains the manifest file and its string tables.
+          'target_name': 'chrome_manifest_bundle',
+          'type': 'loadable_module',
+          'mac_bundle': 1,
+          'product_extension': 'manifest',
+          'product_name': '<(mac_bundle_id)',
+          'variables': {
+            # This avoids stripping debugging symbols from the target, which
+            # would fail because there is no binary code here.
+            'mac_strip': 0,
+          },
+          'dependencies': [
+             # Provides app-Manifest.plist and its string tables:
+            'policy_templates',
+          ],
+          'actions': [
+            {
+              'action_name': 'Copy MCX manifest file to manifest bundle',
+              'inputs': [
+                '<(grit_out_dir)/app/policy/mac/app-Manifest.plist',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/app_manifest/<(mac_bundle_id).manifest',
+              ],
+              'action': [
+                # Use plutil -convert xml1 to put the plist into Apple's
+                # canonical format. As a side effect, this ensures that the
+                # plist is well-formed.
+                'plutil',
+                '-convert',
+                'xml1',
+                '<@(_inputs)',
+                '-o',
+                '<@(_outputs)',
+              ],
+              'message':
+                'Copying the MCX policy manifest file to the manifest bundle',
+              'process_outputs_as_mac_bundle_resources': 1,
+            },
+            {
+              'action_name':
+                'Copy Localizable.strings files to manifest bundle',
+              'variables': {
+                'input_path': '<(grit_out_dir)/app/policy/mac/strings',
+                # Directory to collect the Localizable.strings files before
+                # they are copied to the bundle.
+                'output_path': '<(INTERMEDIATE_DIR)/app_manifest',
+                # The reason we are not enumerating all the locales is that
+                # the translations would eat up 3.5MB disk space in the
+                # application bundle:
+                'available_locales': 'en',
+              },
+              'inputs': [
+                # TODO: remove this helper when we have loops in GYP
+                '>!@(<(apply_locales_cmd) -d \'<(input_path)/ZZLOCALE.lproj/Localizable.strings\' <(available_locales))',
+              ],
+              'outputs': [
+                # TODO: remove this helper when we have loops in GYP
+                '>!@(<(apply_locales_cmd) -d \'<(output_path)/ZZLOCALE.lproj/Localizable.strings\' <(available_locales))',
+              ],
+              'action': [
+                'cp', '-R',
+                '<(input_path)/',
+                '<(output_path)',
+              ],
+              'message':
+                'Copy the Localizable.strings files to the manifest bundle',
+              'process_outputs_as_mac_bundle_resources': 1,
+              'msvs_cygwin_shell': 1,
+            },
+          ],
+        },
+      ]
+    }]
+  ],  # 'conditions'
+}
diff --git a/chromium/chrome/browser/nacl_host/test/mock_nacl_gdb.gyp b/chromium/chrome/browser/nacl_host/test/mock_nacl_gdb.gyp
new file mode 100644
index 00000000000..d02468a6845
--- /dev/null
+++ b/chromium/chrome/browser/nacl_host/test/mock_nacl_gdb.gyp
@@ -0,0 +1,26 @@
+# Copyright (c) 2012 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': [
+    ['disable_nacl==0 and (OS=="win" or OS=="linux")', {
+      'targets': [
+        {
+          'target_name': 'mock_nacl_gdb',
+          'type': 'executable',
+          'include_dirs': [
+            '../../../../',
+          ],
+          'sources': [
+            'mock_nacl_gdb.cc',
+          ],
+          'dependencies': [
+             '../../../../base/base.gyp:base',
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        },
+      ],
+    }],
+  ],  
+}
\ No newline at end of file
diff --git a/chromium/chrome/browser/performance_monitor/performance_monitor.gyp b/chromium/chrome/browser/performance_monitor/performance_monitor.gyp
new file mode 100644
index 00000000000..e3587f491e8
--- /dev/null
+++ b/chromium/chrome/browser/performance_monitor/performance_monitor.gyp
@@ -0,0 +1,26 @@
+# Copyright (c) 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'performance_monitor',
+      'type': 'static_library',
+      'sources': [
+        '<@(schema_files)',
+      ],
+      'includes': [
+        '../../../build/json_schema_compile.gypi',
+      ],
+      'variables': {
+        'chromium_code': 1,
+        'schema_files': [
+          'events.json',
+        ],
+        'cc_dir': 'chrome/browser/performance_monitor',
+        'root_namespace': 'performance_monitor',
+      },
+    },
+  ],
+}
diff --git a/chromium/chrome/browser/search_engines/prepopulated_engines.gyp b/chromium/chrome/browser/search_engines/prepopulated_engines.gyp
new file mode 100644
index 00000000000..5a3da5f0eea
--- /dev/null
+++ b/chromium/chrome/browser/search_engines/prepopulated_engines.gyp
@@ -0,0 +1,24 @@
+# Copyright 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'prepopulated_engines',
+      'type': 'static_library',
+      'sources': [
+        'prepopulated_engines.json',
+      ],
+      'includes': [
+        '../../../build/json_to_struct.gypi',
+      ],
+      'variables': {
+        'chromium_code': 1,
+        'schema_file': 'prepopulated_engines_schema.json',
+        'namespace': 'TemplateURLPrepopulateData',
+        'cc_dir': 'chrome/browser/search_engines',
+      },
+    },
+  ],
+}
diff --git a/chromium/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp b/chromium/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
new file mode 100644
index 00000000000..d20485797b0
--- /dev/null
+++ b/chromium/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
@@ -0,0 +1,62 @@
+# Copyright (c) 2012 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': {
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'gtk2ui',
+      'type': '<(component)',
+      'dependencies': [
+        '../../../../base/base.gyp:base',
+        '../../../../base/base.gyp:base_i18n',
+        '../../../../build/linux/system.gyp:gtk',
+        '../../../../skia/skia.gyp:skia',
+        '../../../../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../../../../ui/ui.gyp:ui',
+        '../../../../ui/ui.gyp:ui_resources',
+        '../../../../ui/linux_ui/linux_ui.gyp:linux_ui',
+        '../../../chrome_resources.gyp:chrome_extra_resources',
+        '../../../chrome_resources.gyp:chrome_resources',
+        '../../../chrome_resources.gyp:chrome_strings',
+        '../../../chrome_resources.gyp:theme_resources',
+      ],
+      'defines': [
+        'LIBGTK2UI_IMPLEMENTATION',
+      ],
+      # Several of our source files are named _gtk2.cc. This isn't to
+      # differentiate them from their source files (ninja and make are sane
+      # build systems, unlike MSVS). It is instead to get around the rest of
+      # the normal, global gtk exclusion rules, as we are otherwise using gtk
+      # in a non-gtk build.
+      'sources': [
+        'app_indicator_icon.cc',
+        'app_indicator_icon.h',
+        'chrome_gtk_frame.cc',
+        'chrome_gtk_frame.h',
+        'gtk2_ui.cc',
+        'gtk2_ui.h',
+        'gtk2_util.cc',
+        'gtk2_util.h',
+        'libgtk2ui_export.h',
+        'menu_util.cc',
+        'menu_util.h',
+        'native_theme_gtk2.cc',
+        'native_theme_gtk2.h',
+        'owned_widget_gtk2.cc',
+        'owned_widget_gtk2.h',
+        'select_file_dialog_impl.cc',
+        'select_file_dialog_impl.h',
+        'select_file_dialog_impl_gtk2.cc',
+        'select_file_dialog_impl_kde.cc',
+        'skia_utils_gtk2.cc',
+        'skia_utils_gtk2.h',
+        'unity_service.cc',
+        'unity_service.h',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/chrome.gyp b/chromium/chrome/chrome.gyp
new file mode 100644
index 00000000000..b9988b8e68b
--- /dev/null
+++ b/chromium/chrome/chrome.gyp
@@ -0,0 +1,1208 @@
+# Copyright (c) 2012 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': {
+    'chromium_code': 1,
+
+    # Define the common dependencies that contain all the actual
+    # Chromium functionality.  This list gets pulled in below by
+    # the link of the actual chrome (or chromium) executable on
+    # Linux or Mac, and into chrome.dll on Windows.
+    # NOTE: Most new includes should go in the OS!="ios" condition below.
+    'chromium_browser_dependencies': [
+      'common',
+      'browser',
+      '../sync/sync.gyp:sync',
+    ],
+    'chromium_child_dependencies': [
+      'common',
+      '../sync/sync.gyp:sync',
+    ],
+    'allocator_target': '../base/allocator/allocator.gyp:allocator',
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
+    'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
+    'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
+    # TODO: remove this helper when we have loops in GYP
+    'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
+    'conditions': [
+      ['OS!="ios"', {
+        'chromium_browser_dependencies': [
+          '../printing/printing.gyp:printing',
+          '../ppapi/ppapi_internal.gyp:ppapi_host',
+        ],
+        'chromium_child_dependencies': [
+          'debugger',
+          'plugin',
+          'renderer',
+          'utility',
+          '../content/content.gyp:content_gpu',
+          '../content/content.gyp:content_ppapi_plugin',
+          '../content/content.gyp:content_worker',
+          '../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_resources',
+        ],
+      }],
+      ['OS=="win"', {
+        'platform_locale_settings_grd':
+            'app/resources/locale_settings_win.grd',
+      },],
+      ['enable_printing==1', {
+        'chromium_browser_dependencies': [
+          'service',
+        ],
+      }],
+      ['OS=="linux"', {
+        'conditions': [
+          ['chromeos==1', {
+            'conditions': [
+              ['branding=="Chrome"', {
+                'platform_locale_settings_grd':
+                    'app/resources/locale_settings_google_chromeos.grd',
+              }, {  # branding!=Chrome
+                'platform_locale_settings_grd':
+                    'app/resources/locale_settings_chromiumos.grd',
+              }],
+            ]
+          }, {  # chromeos==0
+            'platform_locale_settings_grd':
+                'app/resources/locale_settings_linux.grd',
+          }],
+        ],
+      },],
+      ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "linux"', {
+        'platform_locale_settings_grd':
+            'app/resources/locale_settings_linux.grd',
+      },],
+      ['OS=="mac"', {
+        'tweak_info_plist_path': '../build/mac/tweak_info_plist.py',
+        'platform_locale_settings_grd':
+            'app/resources/locale_settings_mac.grd',
+        'conditions': [
+          ['branding=="Chrome"', {
+            'mac_bundle_id': 'com.google.Chrome',
+            'mac_creator': 'rimZ',
+            # The policy .grd file also needs the bundle id.
+            'grit_defines': ['-D', 'mac_bundle_id=com.google.Chrome'],
+          }, {  # else: branding!="Chrome"
+            'mac_bundle_id': 'org.chromium.Chromium',
+            'mac_creator': 'Cr24',
+            # The policy .grd file also needs the bundle id.
+            'grit_defines': ['-D', 'mac_bundle_id=org.chromium.Chromium'],
+          }],  # branding
+        ],  # conditions
+      }],  # OS=="mac"
+    ],  # conditions
+  },  # variables
+  'includes': [
+    # Place some targets in gypi files to reduce contention on this file.
+    # By using an include, we keep everything in a single xcodeproj file.
+    # Note on Win64 targets: targets that end with win64 be used
+    # on 64-bit Windows only. Targets that end with nacl_win64 should be used
+    # by Native Client only.
+    # NOTE: Most new includes should go in the OS!="ios" condition below.
+    '../build/win_precompile.gypi',
+    'chrome_browser.gypi',
+    'chrome_browser_ui.gypi',
+    'chrome_common.gypi',
+    'chrome_installer_util.gypi',
+    'chrome_tests_unit.gypi',
+    'version.gypi',
+    '../components/nacl/nacl_defines.gypi',
+  ],
+  'conditions': [
+    ['OS!="ios"', {
+      'includes': [
+        'app/policy/policy_templates.gypi',
+        'chrome_browser_extensions.gypi',
+        'chrome_dll.gypi',
+        'chrome_exe.gypi',
+        'chrome_installer.gypi',
+        'chrome_renderer.gypi',
+        'chrome_tests.gypi',
+        'nacl.gypi',
+        '../apps/apps.gypi',
+      ],
+      'targets': [
+        {
+          'target_name': 'default_extensions',
+          'type': 'none',
+          'conditions': [
+            ['OS=="win"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/extensions',
+                  'files': [
+                    'browser/extensions/default_extensions/external_extensions.json'
+                  ]
+                }
+              ],
+            }],
+            ['OS=="linux" and chromeos==1 and branding=="Chrome"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': [
+                    'browser/extensions/default_extensions/chromeos/extensions/'
+                  ]
+                }
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'debugger',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'chrome_resources.gyp:chrome_extra_resources',
+            'chrome_resources.gyp:chrome_resources',
+            'chrome_resources.gyp:chrome_strings',
+            'chrome_resources.gyp:theme_resources',
+            'common/extensions/api/api.gyp:api',
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_browser',
+            '../net/net.gyp:http_server',
+            '../net/net.gyp:net',
+            '../skia/skia.gyp:skia',
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
+            '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+            '../third_party/libusb/libusb.gyp:libusb',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'browser/devtools/adb/android_rsa.cc',
+            'browser/devtools/adb/android_rsa.h',
+            'browser/devtools/adb/android_usb_device.cc',
+            'browser/devtools/adb/android_usb_device.h',
+            'browser/devtools/adb/android_usb_socket.cc',
+            'browser/devtools/adb/android_usb_socket.h',
+            'browser/devtools/adb_client_socket.cc',
+            'browser/devtools/adb_client_socket.h',
+            'browser/devtools/adb_web_socket.cc',
+            'browser/devtools/adb_web_socket.h',
+            'browser/devtools/browser_list_tabcontents_provider.cc',
+            'browser/devtools/browser_list_tabcontents_provider.h',
+            'browser/devtools/devtools_adb_bridge.cc',
+            'browser/devtools/devtools_adb_bridge.h',
+            'browser/devtools/devtools_file_helper.cc',
+            'browser/devtools/devtools_file_helper.h',
+            'browser/devtools/devtools_file_system_indexer.cc',
+            'browser/devtools/devtools_file_system_indexer.h',
+            'browser/devtools/devtools_protocol.cc',
+            'browser/devtools/devtools_protocol.h',
+            'browser/devtools/devtools_toggle_action.h',
+            'browser/devtools/devtools_window.cc',
+            'browser/devtools/devtools_window.h',
+            'browser/devtools/remote_debugging_server.cc',
+            'browser/devtools/remote_debugging_server.h',
+            'browser/devtools/tethering_adb_filter.cc',
+            'browser/devtools/tethering_adb_filter.h',
+          ],
+          'conditions': [
+            ['toolkit_uses_gtk == 1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
+            ['OS=="android"', {
+              'dependencies!': [
+                '../third_party/libusb/libusb.gyp:libusb',
+              ],
+              'sources!': [
+                'browser/devtools/browser_list_tabcontents_provider.cc',
+                'browser/devtools/devtools_window.cc',
+                'browser/devtools/remote_debugging_server.cc',
+              ],
+            }],
+            ['debug_devtools==1', {
+              'defines': [
+                'DEBUG_DEVTOOLS=1',
+               ],
+            }],
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        },
+        {
+          'target_name': 'plugin',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'chrome_resources.gyp:chrome_strings',
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_plugin',
+          ],
+          'sources': [
+            'plugin/chrome_content_plugin_client.cc',
+            'plugin/chrome_content_plugin_client.h',
+          ],
+          'include_dirs': [
+            '..',
+            '<(grit_out_dir)',
+          ],
+        },
+        {
+          'target_name': 'utility',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_utility',
+            '../media/media.gyp:media',
+            '../skia/skia.gyp:skia',
+            '../third_party/libxml/libxml.gyp:libxml',
+            'common',
+            '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
+            '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
+          ],
+          'sources': [
+            'utility/chrome_content_utility_client.cc',
+            'utility/chrome_content_utility_client.h',
+            'utility/extensions/unpacker.cc',
+            'utility/extensions/unpacker.h',
+            'utility/importer/bookmark_html_reader.cc',
+            'utility/importer/bookmark_html_reader.h',
+            'utility/importer/bookmarks_file_importer.cc',
+            'utility/importer/bookmarks_file_importer.h',
+            'utility/importer/external_process_importer_bridge.cc',
+            'utility/importer/external_process_importer_bridge.h',
+            'utility/importer/favicon_reencode.cc',
+            'utility/importer/favicon_reencode.h',
+            'utility/importer/firefox_importer.cc',
+            'utility/importer/firefox_importer.h',
+            'utility/importer/firefox_importer_unittest_messages_internal.h',
+            'utility/importer/firefox_importer_unittest_utils.h',
+            'utility/importer/firefox_importer_unittest_utils_mac.cc',
+            'utility/importer/ie_importer_win.cc',
+            'utility/importer/ie_importer_win.h',
+            'utility/importer/importer.cc',
+            'utility/importer/importer.h',
+            'utility/importer/importer_creator.cc',
+            'utility/importer/importer_creator.h',
+            'utility/importer/nss_decryptor.cc',
+            'utility/importer/nss_decryptor.h',
+            'utility/importer/nss_decryptor_mac.h',
+            'utility/importer/nss_decryptor_mac.mm',
+            'utility/importer/nss_decryptor_win.cc',
+            'utility/importer/nss_decryptor_win.h',
+            'utility/importer/safari_importer.h',
+            'utility/importer/safari_importer.mm',
+            'utility/media_galleries/itunes_pref_parser_win.cc',
+            'utility/media_galleries/itunes_pref_parser_win.h',
+            'utility/profile_import_handler.cc',
+            'utility/profile_import_handler.h',
+            'utility/utility_message_handler.h',
+            'utility/web_resource_unpacker.cc',
+            'utility/web_resource_unpacker.h',
+          ],
+          'include_dirs': [
+            '..',
+            '<(grit_out_dir)',
+          ],
+          'conditions': [
+            ['toolkit_uses_gtk == 1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
+            ['OS=="win" or OS=="mac"', {
+              'sources': [
+                'utility/media_galleries/itunes_library_parser.cc',
+                'utility/media_galleries/itunes_library_parser.h',
+                'utility/media_galleries/picasa_album_table_reader.cc',
+                'utility/media_galleries/picasa_album_table_reader.h',
+                'utility/media_galleries/picasa_albums_indexer.cc',
+                'utility/media_galleries/picasa_albums_indexer.h',
+                'utility/media_galleries/pmp_column_reader.cc',
+                'utility/media_galleries/pmp_column_reader.h',
+              ],
+            }],
+            ['use_openssl==1', {
+              'sources!': [
+                'utility/importer/nss_decryptor.cc',
+              ]
+            }],
+            ['OS!="win" and OS!="mac" and use_openssl==0', {
+              'dependencies': [
+                '../crypto/crypto.gyp:crypto',
+              ],
+              'sources': [
+                'utility/importer/nss_decryptor_system_nss.cc',
+                'utility/importer/nss_decryptor_system_nss.h',
+              ],
+            }],
+            ['OS=="android"', {
+              'sources/': [
+                ['exclude', '^utility/importer/'],
+                ['exclude', '^utility/profile_import_handler\.cc'],
+              ],
+            }],
+            ['enable_mdns == 1', {
+              'sources': [
+                'utility/local_discovery/service_discovery_client_impl.cc',
+                'utility/local_discovery/service_discovery_client_impl.h',
+                'utility/local_discovery/service_discovery_message_handler.cc',
+                'utility/local_discovery/service_discovery_message_handler.h',
+              ]
+            }],
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        },
+        {
+          'target_name': 'ipclist',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'test_support_common',
+            '../skia/skia.gyp:skia',
+            '../sync/sync.gyp:sync',
+          ],
+          'include_dirs': [
+             '..',
+          ],
+          'sources': [
+            'tools/ipclist/ipclist.cc',
+          ],
+        },
+      ],
+    }],  # OS!="ios"
+    ['OS=="mac"',
+      { 'targets': [
+        {
+          'target_name': 'helper_app',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'product_name': '<(mac_product_name) Helper',
+          'mac_bundle': 1,
+          'dependencies': [
+            'chrome_dll',
+            'infoplist_strings_tool',
+          ],
+          'sources': [
+            # chrome_exe_main_mac.cc's main() is the entry point for
+            # the "chrome" (browser app) target.  All it does is jump
+            # to chrome_dll's ChromeMain.  This is appropriate for
+            # helper processes too, because the logic to discriminate
+            # between process types at run time is actually directed
+            # by the --type command line argument processed by
+            # ChromeMain.  Sharing chrome_exe_main_mac.cc with the
+            # browser app will suffice for now.
+            'app/chrome_exe_main_mac.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': {
+            'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
+            'CHROMIUM_SHORT_NAME': '<(branding)',
+            'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves',
+            'INFOPLIST_FILE': 'app/helper-Info.plist',
+          },
+          'postbuilds': [
+            {
+              # The helper doesn't have real localizations, it just has
+              # empty .lproj directories, which is enough to convince Cocoa
+              # that anything running out of the helper .app supports those
+              # languages.
+              'postbuild_name': 'Make Empty Localizations',
+              'variables': {
+                'locale_dirs': [
+                  '>!@(<(apply_locales_cmd) -d ZZLOCALE.lproj <(locales))',
+                ],
+              },
+              'action': [
+                'tools/build/mac/make_locale_dirs.sh',
+                '<@(locale_dirs)',
+              ],
+            },
+            {
+              # The framework (chrome_dll) 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/../Versions/<(version_full)/<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
+                '@executable_path/../../../<(mac_product_name) Framework.framework/<(mac_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': ['<(tweak_info_plist_path)',
+                         '--breakpad=0',
+                         '--keystone=0',
+                         '--scm=0'],
+            },
+            {
+              # 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',
+              ],
+            },
+          ],
+          'conditions': [
+            ['mac_breakpad==1', {
+              'variables': {
+                # A real .dSYM is needed for dump_syms to operate on.
+                'mac_real_dsym': 1,
+              },
+              'xcode_settings': {
+                # With mac_real_dsym set, strip_from_xcode won't be used.
+                # Specify CHROMIUM_STRIP_SAVE_FILE directly to Xcode.
+                'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)',
+              },
+            }],
+            ['asan==1', {
+              'xcode_settings': {
+                # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE.
+                'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
+              },
+            }],
+            ['component=="shared_library"', {
+              'xcode_settings': {
+                'LD_RUNPATH_SEARCH_PATHS': [
+                  # Get back from Chromium.app/Contents/Versions/V/
+                  #                                    Helper.app/Contents/MacOS
+                  '@loader_path/../../../../../../..',
+                ],
+              },
+            }],
+          ],
+        },  # target helper_app
+        {
+          # A library containing the actual code for the app mode app, shared
+          # by unit tests.
+          'target_name': 'app_mode_app_support',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'product_name': 'app_mode_app_support',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'common_constants.gyp:common_constants',
+          ],
+          'sources': [
+            'common/mac/app_mode_chrome_locator.h',
+            'common/mac/app_mode_chrome_locator.mm',
+            'common/mac/app_mode_common.h',
+            'common/mac/app_mode_common.mm',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+        },  # target app_mode_app_support
+        {
+          # This produces the template for app mode loader bundles. It's a
+          # template in the sense that parts of it need to be "filled in" by
+          # Chrome before it can be executed.
+          'target_name': 'app_mode_app',
+          'type': 'executable',
+          'mac_bundle' : 1,
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'product_name': 'app_mode_loader',
+          'dependencies': [
+            'app_mode_app_support',
+            'infoplist_strings_tool',
+          ],
+          'sources': [
+            'app/app_mode_loader_mac.mm',
+            'app/app_mode-Info.plist',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+            ],
+          },
+          'mac_bundle_resources!': [
+            'app/app_mode-Info.plist',
+          ],
+          'mac_bundle_resources/': [
+            ['exclude', '.*'],
+          ],
+          'xcode_settings': {
+            'INFOPLIST_FILE': 'app/app_mode-Info.plist',
+            'APP_MODE_APP_BUNDLE_ID': '<(mac_bundle_id).app.@APP_MODE_SHORTCUT_ID@',
+          },
+          'postbuilds' : [
+            {
+              # 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 app mode loader.
+              'postbuild_name': 'Tweak Info.plist',
+              'action': ['<(tweak_info_plist_path)',
+                         '--breakpad=0',
+                         '--keystone=0',
+                         '--scm=0'],
+            },
+          ],
+        },  # target app_mode_app
+        {
+          # Convenience target to build a disk image.
+          'target_name': 'build_app_dmg',
+          # Don't place this in the 'all' list; most won't want it.
+          # In GYP, booleans are 0/1, not True/False.
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+          ],
+          'variables': {
+            'build_app_dmg_script_path': 'tools/build/mac/build_app_dmg',
+            'pkg_dmg_script_path': 'installer/mac/pkg-dmg',
+
+            'conditions': [
+              # This duplicates the output path from build_app_dmg.
+              ['branding=="Chrome"', {
+                'dmg_name': 'GoogleChrome.dmg',
+              }, { # else: branding!="Chrome"
+                'dmg_name': 'Chromium.dmg',
+              }],
+            ],
+          },
+          'actions': [
+            {
+              'inputs': [
+                '<(build_app_dmg_script_path)',
+                '<(pkg_dmg_script_path)',
+                '<(PRODUCT_DIR)/<(mac_product_name).app',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/<(dmg_name)',
+              ],
+              'action_name': 'build_app_dmg',
+              'action': ['<(build_app_dmg_script_path)', '<@(branding)'],
+            },
+          ],  # 'actions'
+        },
+        {
+          # Dummy target to allow chrome to require plugin_carbon_interpose to
+          # build without actually linking to the resulting library.
+          'target_name': 'interpose_dependency_shim',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'plugin_carbon_interpose',
+          ],
+          # In release, we end up with a strip step that is unhappy if there is
+          # no binary. Rather than check in a new file for this temporary hack,
+          # just generate a source file on the fly.
+          'actions': [
+            {
+              'action_name': 'generate_stub_main',
+              'process_outputs_as_sources': 1,
+              'inputs': [],
+              'outputs': [ '<(INTERMEDIATE_DIR)/dummy_main.c' ],
+              'action': [
+                'bash', '-c',
+                'echo "int main() { return 0; }" > <(INTERMEDIATE_DIR)/dummy_main.c'
+              ],
+            },
+          ],
+        },
+        {
+          # dylib for interposing Carbon calls in the plugin process.
+          'target_name': 'plugin_carbon_interpose',
+          'type': 'shared_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          # This target must not depend on static libraries, else the code in
+          # those libraries would appear twice in plugin processes: Once from
+          # Chromium Framework, and once from this dylib.
+          'dependencies': [
+            'chrome_dll',
+          ],
+          'conditions': [
+            ['component=="shared_library"', {
+              'dependencies': [
+                '../webkit/support/webkit_support.gyp:glue',
+                '../content/content.gyp:content_plugin',
+              ],
+              'xcode_settings': {
+                'LD_RUNPATH_SEARCH_PATHS': [
+                  # Get back from Chromium.app/Contents/Versions/V
+                  '@loader_path/../../../..',
+                ],
+              },
+            }],
+          ],
+          'sources': [
+            '../content/plugin/plugin_carbon_interpose_mac.cc',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+            ],
+          },
+          'xcode_settings': {
+            'DYLIB_COMPATIBILITY_VERSION': '<(version_mac_dylib)',
+            'DYLIB_CURRENT_VERSION': '<(version_mac_dylib)',
+            'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..',
+          },
+          'postbuilds': [
+            {
+              # The framework (chrome_dll) defines its load-time path
+              # (DYLIB_INSTALL_NAME_BASE) relative to the main executable
+              # (chrome).  A different relative path needs to be used in
+              # plugin_carbon_interpose, which runs in the helper_app.
+              'postbuild_name': 'Fix Framework Link',
+              'action': [
+                'install_name_tool',
+                '-change',
+                '@executable_path/../Versions/<(version_full)/<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
+                '@executable_path/../../../<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
+                '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
+              ],
+            },
+          ],
+        },
+        {
+          'target_name': 'infoplist_strings_tool',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'chrome_resources.gyp:chrome_strings',
+            '../base/base.gyp:base',
+            '../ui/ui.gyp:ui',
+          ],
+          'include_dirs': [
+            '<(grit_out_dir)',
+          ],
+          'sources': [
+            'tools/mac_helpers/infoplist_strings_util.mm',
+          ],
+        },
+      ],  # targets
+    }],  # OS=="mac"
+    ['OS!="mac" and OS!="ios"', {
+      'targets': [
+        {
+          'target_name': 'convert_dict',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            'convert_dict_lib',
+            '../third_party/hunspell/hunspell.gyp:hunspell',
+          ],
+          'sources': [
+            'tools/convert_dict/convert_dict.cc',
+          ],
+        },
+        {
+          'target_name': 'convert_dict_lib',
+          'product_name': 'convert_dict',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'include_dirs': [
+            '..',
+          ],
+          'dependencies': [
+            '../base/base.gyp:base',
+          ],
+          'sources': [
+            'tools/convert_dict/aff_reader.cc',
+            'tools/convert_dict/aff_reader.h',
+            'tools/convert_dict/dic_reader.cc',
+            'tools/convert_dict/dic_reader.h',
+            'tools/convert_dict/hunspell_reader.cc',
+            'tools/convert_dict/hunspell_reader.h',
+          ],
+        },
+        {
+          'target_name': 'flush_cache',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/base.gyp:test_support_base',
+          ],
+          'sources': [
+            'tools/perf/flush_cache/flush_cache.cc',
+          ],
+        },
+      ],
+    }],  # OS!="mac" and OS!="ios"
+    ['OS=="linux"',
+      { 'targets': [
+        {
+          'target_name': 'linux_symbols',
+          'type': 'none',
+          'conditions': [
+            ['linux_dump_symbols==1', {
+              'actions': [
+                {
+                  'action_name': 'dump_symbols',
+                  'inputs': [
+                    '<(DEPTH)/build/linux/dump_app_syms',
+                    '<(PRODUCT_DIR)/dump_syms',
+                    '<(PRODUCT_DIR)/chrome',
+                  ],
+                  'outputs': [
+                    '<(PRODUCT_DIR)/chrome.breakpad.<(target_arch)',
+                  ],
+                  'action': ['<(DEPTH)/build/linux/dump_app_syms',
+                             '<(PRODUCT_DIR)/dump_syms',
+                             '<(linux_strip_binary)',
+                             '<(PRODUCT_DIR)/chrome',
+                             '<@(_outputs)'],
+                  'message': 'Dumping breakpad symbols to <(_outputs)',
+                  'process_outputs_as_sources': 1,
+                },
+              ],
+              'dependencies': [
+                'chrome',
+                '../breakpad/breakpad.gyp:dump_syms',
+              ],
+            }],
+            ['linux_strip_reliability_tests==1', {
+              'actions': [
+                {
+                  'action_name': 'strip_reliability_tests',
+                  'inputs': [
+                    '<(PRODUCT_DIR)/automated_ui_tests',
+                    '<(PRODUCT_DIR)/reliability_tests',
+                    '<(PRODUCT_DIR)/_pyautolib.so',
+                  ],
+                  'outputs': [
+                    '<(PRODUCT_DIR)/strip_reliability_tests.stamp',
+                  ],
+                  'action': ['strip',
+                             '-g',
+                             '<@(_inputs)'],
+                  'message': 'Stripping reliability tests',
+                },
+              ],
+              'dependencies': [
+                'automated_ui_tests',
+                'reliability_tests',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'ipcfuzz',
+          'type': 'loadable_module',
+          'include_dirs': [
+            '..',
+          ],
+          'dependencies': [
+            'test_support_common',
+            '../skia/skia.gyp:skia',
+          ],
+          'sources': [
+            'tools/ipclist/ipcfuzz.cc',
+          ],
+        },
+      ],
+    }],  # OS=="linux"
+    ['OS=="win"',
+      { 'targets': [
+        {
+          # For historical reasons, chrome/chrome.sln has been the entry point
+          # for new Chrome developers. To assist development, include several
+          # core unittests that are otherwise only accessible side-by-side with
+          # chrome via all/all.sln.
+          'target_name': 'test_targets',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_unittests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+            '../content/content.gyp:content_browsertests',
+            '../content/content.gyp:content_shell',
+            '../content/content.gyp:content_unittests',
+            '../net/net.gyp:net_unittests',
+            '../ui/ui.gyp:ui_unittests',
+          ],
+          'conditions': [
+            ['use_aura==1 or target_arch=="x64"', {
+              'dependencies!': [
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'chrome_version_resources',
+          'type': 'none',
+          'conditions': [
+            ['branding == "Chrome"', {
+              'variables': {
+                 'branding_path': 'app/theme/google_chrome/BRANDING',
+              },
+            }, { # else branding!="Chrome"
+              'variables': {
+                 'branding_path': 'app/theme/chromium/BRANDING',
+              },
+            }],
+          ],
+          'variables': {
+            'output_dir': 'chrome_version',
+            'template_input_path': 'app/chrome_version.rc.version',
+          },
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
+            ],
+          },
+          'sources': [
+            'app/app_host_exe.ver',
+            'app/chrome_exe.ver',
+            'app/chrome_dll.ver',
+            'app/nacl64_exe.ver',
+            'app/other.ver',
+          ],
+          'includes': [
+            'version_resource_rules.gypi',
+          ],
+        },
+        {
+          'target_name': 'chrome_version_header',
+          'type': 'none',
+          'hard_dependency': 1,
+          'actions': [
+            {
+              'action_name': 'version_header',
+              'variables': {
+                'lastchange_path':
+                  '<(DEPTH)/build/util/LASTCHANGE',
+              },
+              'conditions': [
+                ['branding == "Chrome"', {
+                  'variables': {
+                     'branding_path': 'app/theme/google_chrome/BRANDING',
+                  },
+                }, { # else branding!="Chrome"
+                  'variables': {
+                     'branding_path': 'app/theme/chromium/BRANDING',
+                  },
+                }],
+              ],
+              'inputs': [
+                '<(version_path)',
+                '<(branding_path)',
+                '<(lastchange_path)',
+                'version.h.in',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/version.h',
+              ],
+              'action': [
+                'python',
+                '<(version_py_path)',
+                '-f', '<(version_path)',
+                '-f', '<(branding_path)',
+                '-f', '<(lastchange_path)',
+                'version.h.in',
+                '<@(_outputs)',
+              ],
+              'message': 'Generating version header file: <@(_outputs)',
+            },
+          ],
+        },
+        {
+          'target_name': 'automation',
+          'type': 'static_library',
+          'dependencies': [
+            'chrome_resources.gyp:theme_resources',
+            '../skia/skia.gyp:skia',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+             'test/automation/automation_handle_tracker.cc',
+             'test/automation/automation_handle_tracker.h',
+             'test/automation/automation_json_requests.cc',
+             'test/automation/automation_json_requests.h',
+             'test/automation/automation_proxy.cc',
+             'test/automation/automation_proxy.h',
+             'test/automation/browser_proxy.cc',
+             'test/automation/browser_proxy.h',
+             'test/automation/tab_proxy.cc',
+             'test/automation/tab_proxy.h',
+             'test/automation/value_conversion_traits.cc',
+             'test/automation/value_conversion_traits.h',
+             'test/automation/value_conversion_util.h',
+             'test/automation/window_proxy.cc',
+             'test/automation/window_proxy.h',
+          ],
+        },
+        {
+          'target_name': 'crash_service',
+          'type': 'executable',
+          'dependencies': [
+            'installer_util',
+            '../base/base.gyp:base',
+            '../breakpad/breakpad.gyp:breakpad_handler',
+            '../breakpad/breakpad.gyp:breakpad_sender',
+            '../chrome/common_constants.gyp:common_constants',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'tools/crash_service/crash_service.cc',
+            'tools/crash_service/crash_service.h',
+            'tools/crash_service/main.cc',
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
+            },
+          },
+        },
+        {
+          'target_name': 'sb_sigutil',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'safe_browsing_proto',
+          ],
+          'sources': [
+            'browser/safe_browsing/signature_util.h',
+            'browser/safe_browsing/signature_util_win.cc',
+            'tools/safe_browsing/sb_sigutil.cc',
+          ],
+        },
+      ],  # 'targets'
+      'includes': [
+        'chrome_process_finder.gypi',
+        'metro_utils.gypi',
+      ],
+    }],  # OS=="win"
+    ['OS=="win" and target_arch=="ia32"',
+      { 'targets': [
+        {
+          'target_name': 'chrome_user32_delay_imports',
+          'type': 'none',
+          'variables': {
+            'lib_dir': '<(INTERMEDIATE_DIR)',
+          },
+          'sources': [
+              'chrome.user32.delay.imports'
+          ],
+          'includes': [
+              '../build/win/importlibs/create_import_lib.gypi',
+          ],
+          'direct_dependent_settings': {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'AdditionalLibraryDirectories': ['<(lib_dir)', ],
+                'AdditionalDependencies': ['chrome.user32.delay.lib', ],
+              },
+            },
+          },
+        },
+        {
+          'target_name': 'crash_service_win64',
+          'type': 'executable',
+          'product_name': 'crash_service64',
+          'dependencies': [
+            'installer_util_nacl_win64',
+            '../base/base.gyp:base_static_win64',
+            '../breakpad/breakpad.gyp:breakpad_handler_win64',
+            '../breakpad/breakpad.gyp:breakpad_sender_win64',
+            '../chrome/common_constants.gyp:common_constants_win64',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'tools/crash_service/crash_service.cc',
+            'tools/crash_service/crash_service.h',
+            'tools/crash_service/main.cc',
+            '../content/public/common/content_switches.cc',
+          ],
+          'defines': [
+            'COMPILE_CONTENT_STATICALLY',
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
+            },
+          },
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+        },
+      ]},  # 'targets'
+    ],  # OS=="win" and target_arch=="ia32"
+    ['chromeos==1', {
+      'includes': [ 'chrome_browser_chromeos.gypi' ],
+    }],  # chromeos==1
+    ['OS=="android"',
+      {
+      'targets': [
+        {
+          'target_name': 'chrome_java',
+          'type': 'none',
+          'dependencies': [
+            'chrome_resources.gyp:chrome_strings',
+            'profile_sync_service_model_type_selection_java',
+            'resource_id_java',
+            'toolbar_model_security_levels_java',
+            '../base/base.gyp:base',
+            '../components/components.gyp:autofill_java',
+            '../components/components.gyp:navigation_interception_java',
+            '../components/components.gyp:sessions',
+            '../components/components.gyp:web_contents_delegate_android_java',
+            '../content/content.gyp:content_java',
+            '../sync/sync.gyp:sync_java',
+            '../third_party/guava/guava.gyp:guava_javalib',
+            '../ui/ui.gyp:ui_java',
+          ],
+          'variables': {
+            'java_in_dir': '../chrome/android/java',
+            'has_java_resources': 1,
+            'R_package': 'org.chromium.chrome',
+            'R_package_relpath': 'org/chromium/chrome',
+            'java_strings_grd': 'android_chrome_strings.grd',
+            # Include xml string files generated from generated_resources.grd
+            'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],
+            'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'],
+          },
+          'includes': [
+            '../build/java.gypi',
+          ],
+        },
+      ], # 'targets'
+      'includes': [
+        'chrome_android.gypi',
+      ]}, # 'includes'
+    ],  # OS=="android"
+    ['configuration_policy==1 and OS!="android"', {
+      'includes': [ 'policy.gypi', ],
+    }],
+    ['enable_printing==1', {
+      'targets': [
+        {
+          'target_name': 'service',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'chrome_resources.gyp:chrome_strings',
+            'common',
+            'common_net',
+            '../base/base.gyp:base',
+            '../google_apis/google_apis.gyp:google_apis',
+            '../jingle/jingle.gyp:notifier',
+            '../net/net.gyp:net',
+            '../printing/printing.gyp:printing',
+            '../skia/skia.gyp:skia',
+            '../third_party/libjingle/libjingle.gyp:libjingle',
+          ],
+          'sources': [
+            'service/chrome_service_application_mac.h',
+            'service/chrome_service_application_mac.mm',
+            'service/service_ipc_server.cc',
+            'service/service_ipc_server.h',
+            'service/service_main.cc',
+            'service/service_process.cc',
+            'service/service_process.h',
+            'service/service_process_prefs.cc',
+            'service/service_process_prefs.h',
+            'service/service_utility_process_host.cc',
+            'service/service_utility_process_host.h',
+            'service/cloud_print/cloud_print_auth.cc',
+            'service/cloud_print/cloud_print_auth.h',
+            'service/cloud_print/cloud_print_connector.cc',
+            'service/cloud_print/cloud_print_connector.h',
+            'service/cloud_print/cloud_print_helpers.cc',
+            'service/cloud_print/cloud_print_helpers.h',
+            'service/cloud_print/cloud_print_proxy.cc',
+            'service/cloud_print/cloud_print_proxy.h',
+            'service/cloud_print/cloud_print_proxy_backend.cc',
+            'service/cloud_print/cloud_print_proxy_backend.h',
+            'service/cloud_print/cloud_print_token_store.cc',
+            'service/cloud_print/cloud_print_token_store.h',
+            'service/cloud_print/cloud_print_url_fetcher.cc',
+            'service/cloud_print/cloud_print_url_fetcher.h',
+            'service/cloud_print/cloud_print_wipeout.cc',
+            'service/cloud_print/cloud_print_wipeout.h',
+            'service/cloud_print/connector_settings.cc',
+            'service/cloud_print/connector_settings.h',
+            'service/cloud_print/job_status_updater.cc',
+            'service/cloud_print/job_status_updater.h',
+            'service/cloud_print/print_system_dummy.cc',
+            'service/cloud_print/print_system.cc',
+            'service/cloud_print/print_system.h',
+            'service/cloud_print/printer_job_handler.cc',
+            'service/cloud_print/printer_job_handler.h',
+            'service/cloud_print/printer_job_queue_handler.cc',
+            'service/cloud_print/printer_job_queue_handler.h',
+            'service/net/service_url_request_context.cc',
+            'service/net/service_url_request_context.h',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'defines': [
+                # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
+                # of cloud print system, and allows to use custom implementaiton.
+                'CP_PRINT_SYSTEM_AVAILABLE',
+              ],
+              'sources': [
+                'service/cloud_print/print_system_win.cc',
+              ],
+            }],
+            ['toolkit_uses_gtk == 1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
+            ['use_cups==1', {
+              'dependencies': [
+                '../printing/printing.gyp:cups',
+              ],
+              'defines': [
+                # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
+                # of cloud print system, and allows to use custom implementaiton.
+                'CP_PRINT_SYSTEM_AVAILABLE',
+              ],
+              'sources': [
+                'service/cloud_print/print_system_cups.cc',
+              ],
+            }],
+          ],
+        },
+      ],
+    }],
+  ],  # 'conditions'
+}
diff --git a/chromium/chrome/chrome_android.gypi b/chromium/chrome/chrome_android.gypi
new file mode 100644
index 00000000000..8237fac6e5e
--- /dev/null
+++ b/chromium/chrome/chrome_android.gypi
@@ -0,0 +1,162 @@
+# Copyright (c) 2012 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': {
+    'chromium_code': 1,
+    'package_name': 'chromium_testshell',
+  },
+  'includes': [
+    'chrome_android_paks.gypi', # Included for the list of pak resources.
+  ],
+  'targets': [
+    {
+      'target_name': 'libchromiumtestshell',
+      'type': 'shared_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'chrome_android_core',
+        'chrome_android_auxiliary',
+        'chromium_testshell_jni_headers',
+        'chrome.gyp:browser_ui',
+      ],
+      'sources': [
+        # This file must always be included in the shared_library step to ensure
+        # JNI_OnLoad is exported.
+        'app/android/chrome_jni_onload.cc',
+        'android/testshell/chrome_main_delegate_testshell_android.cc',
+        'android/testshell/chrome_main_delegate_testshell_android.h',
+        "android/testshell/testshell_google_location_settings_helper.cc",
+        "android/testshell/testshell_google_location_settings_helper.h",
+        'android/testshell/testshell_tab.cc',
+        'android/testshell/testshell_tab.h',
+        'android/testshell/testshell_stubs.cc',
+      ],
+      'include_dirs': [
+        '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
+        '../skia/config',
+      ],
+      'conditions': [
+        [ 'order_profiling!=0', {
+          'conditions': [
+            [ 'OS=="android"', {
+              'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
+            }],
+          ],
+        }],
+        [ 'android_use_tcmalloc==1', {
+          'dependencies': [
+            '../base/allocator/allocator.gyp:allocator', ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'chromium_testshell',
+      'type': 'none',
+      'dependencies': [
+        '../media/media.gyp:media_java',
+        'chrome.gyp:chrome_java',
+        'chromium_testshell_paks',
+        'libchromiumtestshell',
+      ],
+      'variables': {
+        'apk_name': 'ChromiumTestShell',
+        'manifest_package_name': 'org.chromium.chrome.testshell',
+        'java_in_dir': 'android/testshell/java',
+        'resource_dir': 'android/testshell/res',
+        'asset_location': '<(ant_build_out)/../assets/<(package_name)',
+        'native_lib_target': 'libchromiumtestshell',
+        'additional_input_paths': [
+          '<@(chrome_android_pak_output_resources)',
+        ],
+      },
+      'includes': [ '../build/java_apk.gypi', ],
+    },
+    {
+      'target_name': 'chromium_testshell_jni_headers',
+      'type': 'none',
+      'sources': [
+        'android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java',
+      ],
+      'variables': {
+        'jni_gen_package': 'chromium_testshell',
+      },
+      'includes': [ '../build/jni_generator.gypi' ],
+    },
+    {
+      # chromium_testshell creates a .jar as a side effect. Any java targets
+      # that need that .jar in their classpath should depend on this target,
+      # chromium_testshell_java. Dependents of chromium_testshell receive its
+      # jar path in the variable 'apk_output_jar_path'.
+      'target_name': 'chromium_testshell_java',
+      'type': 'none',
+      'dependencies': [
+        'chromium_testshell',
+      ],
+      'includes': [ '../build/apk_fake_jar.gypi' ],
+    },
+    {
+      'target_name': 'chrome_android_core',
+      'type': 'static_library',
+      'dependencies': [
+        'chrome.gyp:browser',
+        'chrome.gyp:browser_ui',
+        'chrome.gyp:plugin',
+        'chrome.gyp:renderer',
+        'chrome.gyp:utility',
+        '../content/content.gyp:content',
+      ],
+      'include_dirs': [
+        '..',
+        '<(SHARED_INTERMEDIATE_DIR)/android',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome',
+        '<(android_ndk_include)',
+      ],
+      'sources': [
+        'app/android/chrome_android_initializer.cc',
+        'app/android/chrome_android_initializer.h',
+        'app/android/chrome_data_reduction_proxy_android.cc',
+        'app/android/chrome_data_reduction_proxy_android.h',
+        'app/android/chrome_main_delegate_android.cc',
+        'app/android/chrome_main_delegate_android.h',
+        'app/chrome_main_delegate.cc',
+        'app/chrome_main_delegate.h',
+      ],
+      'link_settings': {
+        'libraries': [
+          '-landroid',
+          '-ljnigraphics',
+        ],
+      },
+    },
+    {
+       'target_name': 'chrome_android_auxiliary',
+       'type': 'static_library',
+       'include_dirs': [
+         '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
+       ],
+       'sources': [
+         'android/testshell/chrome_data_reduction_proxy_testshell_android.cc',
+       ],
+       'dependencies': [
+         '../base/base.gyp:base',
+       ],
+    },
+    {
+      'target_name': 'chromium_testshell_paks',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
+      ],
+      'copies': [
+        {
+          'destination': '<(chrome_android_pak_output_folder)',
+          'files': [
+            '<@(chrome_android_pak_input_resources)',
+          ],
+        }
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/chrome_android_paks.gypi b/chromium/chrome/chrome_android_paks.gypi
new file mode 100644
index 00000000000..6a95ee566dd
--- /dev/null
+++ b/chromium/chrome/chrome_android_paks.gypi
@@ -0,0 +1,107 @@
+# Copyright (c) 2012 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': {
+    'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_name)',
+    'chrome_android_pak_input_resources': [
+      '<(PRODUCT_DIR)/chrome.pak',
+      '<(PRODUCT_DIR)/resources.pak',
+      '<(PRODUCT_DIR)/chrome_100_percent.pak',
+      '<(PRODUCT_DIR)/locales/am.pak',
+      '<(PRODUCT_DIR)/locales/ar.pak',
+      '<(PRODUCT_DIR)/locales/bg.pak',
+      '<(PRODUCT_DIR)/locales/ca.pak',
+      '<(PRODUCT_DIR)/locales/cs.pak',
+      '<(PRODUCT_DIR)/locales/da.pak',
+      '<(PRODUCT_DIR)/locales/de.pak',
+      '<(PRODUCT_DIR)/locales/el.pak',
+      '<(PRODUCT_DIR)/locales/en-GB.pak',
+      '<(PRODUCT_DIR)/locales/en-US.pak',
+      '<(PRODUCT_DIR)/locales/es.pak',
+      '<(PRODUCT_DIR)/locales/es-419.pak',
+      '<(PRODUCT_DIR)/locales/fa.pak',
+      '<(PRODUCT_DIR)/locales/fi.pak',
+      '<(PRODUCT_DIR)/locales/fil.pak',
+      '<(PRODUCT_DIR)/locales/fr.pak',
+      '<(PRODUCT_DIR)/locales/he.pak',
+      '<(PRODUCT_DIR)/locales/hi.pak',
+      '<(PRODUCT_DIR)/locales/hr.pak',
+      '<(PRODUCT_DIR)/locales/hu.pak',
+      '<(PRODUCT_DIR)/locales/id.pak',
+      '<(PRODUCT_DIR)/locales/it.pak',
+      '<(PRODUCT_DIR)/locales/ja.pak',
+      '<(PRODUCT_DIR)/locales/ko.pak',
+      '<(PRODUCT_DIR)/locales/lt.pak',
+      '<(PRODUCT_DIR)/locales/lv.pak',
+      '<(PRODUCT_DIR)/locales/nb.pak',
+      '<(PRODUCT_DIR)/locales/nl.pak',
+      '<(PRODUCT_DIR)/locales/pl.pak',
+      '<(PRODUCT_DIR)/locales/pt-BR.pak',
+      '<(PRODUCT_DIR)/locales/pt-PT.pak',
+      '<(PRODUCT_DIR)/locales/ro.pak',
+      '<(PRODUCT_DIR)/locales/ru.pak',
+      '<(PRODUCT_DIR)/locales/sk.pak',
+      '<(PRODUCT_DIR)/locales/sl.pak',
+      '<(PRODUCT_DIR)/locales/sr.pak',
+      '<(PRODUCT_DIR)/locales/sv.pak',
+      '<(PRODUCT_DIR)/locales/sw.pak',
+      '<(PRODUCT_DIR)/locales/th.pak',
+      '<(PRODUCT_DIR)/locales/tr.pak',
+      '<(PRODUCT_DIR)/locales/uk.pak',
+      '<(PRODUCT_DIR)/locales/vi.pak',
+      '<(PRODUCT_DIR)/locales/zh-CN.pak',
+      '<(PRODUCT_DIR)/locales/zh-TW.pak',
+    ],
+    'chrome_android_pak_output_resources': [
+      '<(chrome_android_pak_output_folder)/chrome.pak',
+      '<(chrome_android_pak_output_folder)/resources.pak',
+      '<(chrome_android_pak_output_folder)/chrome_100_percent.pak',
+      '<(chrome_android_pak_output_folder)/am.pak',
+      '<(chrome_android_pak_output_folder)/ar.pak',
+      '<(chrome_android_pak_output_folder)/bg.pak',
+      '<(chrome_android_pak_output_folder)/ca.pak',
+      '<(chrome_android_pak_output_folder)/cs.pak',
+      '<(chrome_android_pak_output_folder)/da.pak',
+      '<(chrome_android_pak_output_folder)/de.pak',
+      '<(chrome_android_pak_output_folder)/el.pak',
+      '<(chrome_android_pak_output_folder)/en-GB.pak',
+      '<(chrome_android_pak_output_folder)/en-US.pak',
+      '<(chrome_android_pak_output_folder)/es.pak',
+      '<(chrome_android_pak_output_folder)/es-419.pak',
+      '<(chrome_android_pak_output_folder)/fa.pak',
+      '<(chrome_android_pak_output_folder)/fi.pak',
+      '<(chrome_android_pak_output_folder)/fil.pak',
+      '<(chrome_android_pak_output_folder)/fr.pak',
+      '<(chrome_android_pak_output_folder)/he.pak',
+      '<(chrome_android_pak_output_folder)/hi.pak',
+      '<(chrome_android_pak_output_folder)/hr.pak',
+      '<(chrome_android_pak_output_folder)/hu.pak',
+      '<(chrome_android_pak_output_folder)/id.pak',
+      '<(chrome_android_pak_output_folder)/it.pak',
+      '<(chrome_android_pak_output_folder)/ja.pak',
+      '<(chrome_android_pak_output_folder)/ko.pak',
+      '<(chrome_android_pak_output_folder)/lt.pak',
+      '<(chrome_android_pak_output_folder)/lv.pak',
+      '<(chrome_android_pak_output_folder)/nb.pak',
+      '<(chrome_android_pak_output_folder)/nl.pak',
+      '<(chrome_android_pak_output_folder)/pl.pak',
+      '<(chrome_android_pak_output_folder)/pt-BR.pak',
+      '<(chrome_android_pak_output_folder)/pt-PT.pak',
+      '<(chrome_android_pak_output_folder)/ro.pak',
+      '<(chrome_android_pak_output_folder)/ru.pak',
+      '<(chrome_android_pak_output_folder)/sk.pak',
+      '<(chrome_android_pak_output_folder)/sl.pak',
+      '<(chrome_android_pak_output_folder)/sr.pak',
+      '<(chrome_android_pak_output_folder)/sv.pak',
+      '<(chrome_android_pak_output_folder)/sw.pak',
+      '<(chrome_android_pak_output_folder)/th.pak',
+      '<(chrome_android_pak_output_folder)/tr.pak',
+      '<(chrome_android_pak_output_folder)/uk.pak',
+      '<(chrome_android_pak_output_folder)/vi.pak',
+      '<(chrome_android_pak_output_folder)/zh-CN.pak',
+      '<(chrome_android_pak_output_folder)/zh-TW.pak',
+    ],
+  },
+}
+
diff --git a/chromium/chrome/chrome_browser.gypi b/chromium/chrome/chrome_browser.gypi
new file mode 100644
index 00000000000..25e053faa72
--- /dev/null
+++ b/chromium/chrome/chrome_browser.gypi
@@ -0,0 +1,3488 @@
+# Copyright 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'browser',
+      'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'dependencies': [
+        # NOTE: New dependencies should generally be added in the OS!="ios"
+        # dependencies block below, rather than here.
+        'browser/search_engines/prepopulated_engines.gyp:prepopulated_engines',
+        'browser_ui',
+        'cert_logger_proto',
+        'chrome_resources.gyp:chrome_extra_resources',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:platform_locale_settings',
+        'chrome_resources.gyp:theme_resources',
+        'common',
+        'common_net',
+        'feedback_proto',
+        'in_memory_url_index_cache_proto',
+        'probe_message_proto',
+        'safe_browsing_proto',
+        'safe_browsing_report_proto',
+        'variations_seed_proto',
+        '../components/components.gyp:browser_context_keyed_service',
+        '../components/components.gyp:encryptor',
+        '../components/components.gyp:sessions',
+        '../components/components.gyp:user_prefs',
+        '../components/components.gyp:visitedlink_browser',
+        '../components/components.gyp:visitedlink_common',
+        '../components/components.gyp:web_modal',
+        '../components/components.gyp:webdata_common',
+        '../content/content.gyp:content_browser',
+        '../content/content.gyp:content_common',
+        '../crypto/crypto.gyp:crypto',
+        '../google_apis/google_apis.gyp:google_apis',
+        '../jingle/jingle.gyp:notifier',
+        '../media/media.gyp:media',
+        '../skia/skia.gyp:skia',
+        '../sql/sql.gyp:sql',
+        '../sync/sync.gyp:sync',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
+        '../third_party/libxml/libxml.gyp:libxml',
+        '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+        '../third_party/zlib/zlib.gyp:minizip',
+        '../third_party/zlib/zlib.gyp:zip',
+        '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/message_center/message_center.gyp:message_center',
+        '../ui/ui.gyp:shell_dialogs',
+        '../ui/ui.gyp:ui',
+        '../ui/ui.gyp:ui_resources',
+        '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+      ],
+      'include_dirs': [
+        '..',
+        '<(INTERMEDIATE_DIR)',
+        # Needed by chrome_content_renderer_client.cc. &
+        # plugin_info_message_filter.cc.
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
+      'export_dependent_settings': [
+        '../sql/sql.gyp:sql',
+        '../sync/sync.gyp:sync',
+      ],
+      'sources': [
+        # All .cc, .h, .m, and .mm files under browser except for:
+        # * tests and mocks.
+        # * code below browser/chromeos
+        # * code below browser/extensions
+        'browser/about_flags.cc',
+        'browser/about_flags.h',
+        'browser/accessibility/accessibility_extension_api_constants.cc',
+        'browser/accessibility/accessibility_extension_api_constants.h',
+        'browser/accessibility/accessibility_events.cc',
+        'browser/accessibility/accessibility_events.h',
+        'browser/accessibility/invert_bubble_prefs.cc',
+        'browser/accessibility/invert_bubble_prefs.h',
+        'browser/android/chrome_jni_registrar.cc',
+        'browser/android/chrome_jni_registrar.h',
+        'browser/android/chrome_startup_flags.cc',
+        'browser/android/chrome_startup_flags.h',
+        'browser/android/chrome_web_contents_delegate_android.cc',
+        'browser/android/chrome_web_contents_delegate_android.h',
+        'browser/android/content_view_util.cc',
+        'browser/android/content_view_util.h',
+        'browser/android/crash_dump_manager.cc',
+        'browser/android/crash_dump_manager.h',
+        'browser/android/dev_tools_server.cc',
+        'browser/android/dev_tools_server.h',
+        'browser/android/favicon_helper.cc',
+        'browser/android/favicon_helper.h',
+        'browser/android/field_trial_helper.cc',
+        'browser/android/field_trial_helper.h',
+        'browser/android/foreign_session_helper.cc',
+        'browser/android/foreign_session_helper.h',
+        'browser/android/google_location_settings_helper.h',
+        'browser/android/intent_helper.cc',
+        'browser/android/intent_helper.h',
+        'browser/android/intercept_download_resource_throttle.cc',
+        'browser/android/intercept_download_resource_throttle.h',
+        'browser/android/most_visited_sites.cc',
+        'browser/android/most_visited_sites.h',
+        'browser/android/omnibox/omnibox_prerender.cc',
+        'browser/android/omnibox/omnibox_prerender.h',
+        'browser/android/provider/blocking_ui_thread_async_request.cc',
+        'browser/android/provider/blocking_ui_thread_async_request.h',
+        'browser/android/provider/bookmark_model_observer_task.cc',
+        'browser/android/provider/bookmark_model_observer_task.h',
+        'browser/android/provider/chrome_browser_provider.cc',
+        'browser/android/provider/chrome_browser_provider.h',
+        'browser/android/provider/run_on_ui_thread_blocking.h',
+        'browser/android/resource_mapper.cc',
+        'browser/android/resource_mapper.h',
+        'browser/android/resource_id.h',
+        'browser/android/signin/signin_manager_android.cc',
+        'browser/android/signin/signin_manager_android.h',
+        'browser/android/tab_android.cc',
+        'browser/android/tab_android.h',
+        'browser/app_controller_mac.h',
+        'browser/app_controller_mac.mm',
+        'browser/app_icon_win.cc',
+        'browser/app_icon_win.h',
+        'browser/app_mode/app_mode_utils.cc',
+        'browser/app_mode/app_mode_utils.h',
+        'browser/autocomplete/autocomplete_classifier.cc',
+        'browser/autocomplete/autocomplete_classifier.h',
+        'browser/autocomplete/autocomplete_classifier_factory.cc',
+        'browser/autocomplete/autocomplete_classifier_factory.h',
+        'browser/autocomplete/autocomplete_controller.cc',
+        'browser/autocomplete/autocomplete_controller.h',
+        'browser/autocomplete/autocomplete_controller_delegate.h',
+        'browser/autocomplete/autocomplete_input.cc',
+        'browser/autocomplete/autocomplete_input.h',
+        'browser/autocomplete/autocomplete_match.cc',
+        'browser/autocomplete/autocomplete_match.h',
+        'browser/autocomplete/autocomplete_provider.cc',
+        'browser/autocomplete/autocomplete_provider.h',
+        'browser/autocomplete/autocomplete_provider_listener.h',
+        'browser/autocomplete/autocomplete_result.cc',
+        'browser/autocomplete/autocomplete_result.h',
+        'browser/autocomplete/bookmark_provider.cc',
+        'browser/autocomplete/bookmark_provider.h',
+        'browser/autocomplete/builtin_provider.cc',
+        'browser/autocomplete/builtin_provider.h',
+        'browser/autocomplete/contact_provider_chromeos.cc',
+        'browser/autocomplete/contact_provider_chromeos.h',
+        'browser/autocomplete/extension_app_provider.cc',
+        'browser/autocomplete/extension_app_provider.h',
+        'browser/autocomplete/history_provider.cc',
+        'browser/autocomplete/history_provider.h',
+        'browser/autocomplete/history_provider_util.cc',
+        'browser/autocomplete/history_provider_util.h',
+        'browser/autocomplete/history_quick_provider.cc',
+        'browser/autocomplete/history_quick_provider.h',
+        'browser/autocomplete/history_url_provider.cc',
+        'browser/autocomplete/history_url_provider.h',
+        'browser/autocomplete/keyword_provider.cc',
+        'browser/autocomplete/keyword_provider.h',
+        'browser/autocomplete/search_provider.cc',
+        'browser/autocomplete/search_provider.h',
+        'browser/autocomplete/shortcuts_provider.cc',
+        'browser/autocomplete/shortcuts_provider.h',
+        'browser/autocomplete/url_prefix.cc',
+        'browser/autocomplete/url_prefix.h',
+        'browser/autocomplete/zero_suggest_provider.cc',
+        'browser/autocomplete/zero_suggest_provider.h',
+        'browser/autofill/android/personal_data_manager_android.cc',
+        'browser/autofill/android/personal_data_manager_android.h',
+        'browser/autofill/autocheckout_whitelist_manager_factory.cc',
+        'browser/autofill/autocheckout_whitelist_manager_factory.h',
+        'browser/autofill/autofill_cc_infobar_delegate.cc',
+        'browser/autofill/autofill_cc_infobar_delegate.h',
+        'browser/autofill/personal_data_manager_factory.cc',
+        'browser/autofill/personal_data_manager_factory.h',
+        'browser/auto_launch_trial.cc',
+        'browser/auto_launch_trial.h',
+        'browser/automation/automation_browser_tracker.cc',
+        'browser/automation/automation_browser_tracker.h',
+        'browser/automation/automation_event_observers.cc',
+        'browser/automation/automation_event_observers.h',
+        'browser/automation/automation_event_observers_chromeos.cc',
+        'browser/automation/automation_event_queue.cc',
+        'browser/automation/automation_event_queue.h',
+        'browser/automation/automation_provider.cc',
+        'browser/automation/automation_provider.h',
+        'browser/automation/automation_provider_aura.cc',
+        'browser/automation/automation_provider_gtk.cc',
+        'browser/automation/automation_provider_json.cc',
+        'browser/automation/automation_provider_json.h',
+        'browser/automation/automation_provider_list.cc',
+        'browser/automation/automation_provider_list.h',
+        'browser/automation/automation_provider_list_generic.cc',
+        'browser/automation/automation_provider_list_mac.mm',
+        'browser/automation/automation_provider_mac.mm',
+        'browser/automation/automation_provider_observers.cc',
+        'browser/automation/automation_provider_observers.h',
+        'browser/automation/automation_provider_observers_chromeos.cc',
+        'browser/automation/automation_provider_win.cc',
+        'browser/automation/automation_resource_message_filter.cc',
+        'browser/automation/automation_resource_message_filter.h',
+        'browser/automation/automation_resource_tracker.cc',
+        'browser/automation/automation_resource_tracker.h',
+        'browser/automation/automation_tab_tracker.cc',
+        'browser/automation/automation_tab_tracker.h',
+        'browser/automation/automation_util.cc',
+        'browser/automation/automation_util.h',
+        'browser/automation/automation_window_tracker.cc',
+        'browser/automation/automation_window_tracker.h',
+        'browser/automation/chrome_frame_automation_provider_win.cc',
+        'browser/automation/chrome_frame_automation_provider_win.h',
+        'browser/automation/testing_automation_provider.cc',
+        'browser/automation/testing_automation_provider.h',
+        'browser/automation/testing_automation_provider_aura.cc',
+        'browser/automation/testing_automation_provider_chromeos.cc',
+        'browser/automation/testing_automation_provider_gtk.cc',
+        'browser/automation/testing_automation_provider_mac.mm',
+        'browser/automation/testing_automation_provider_views.cc',
+        'browser/automation/testing_automation_provider_win.cc',
+        'browser/automation/url_request_automation_job.cc',
+        'browser/automation/url_request_automation_job.h',
+        'browser/background/background_application_list_model.cc',
+        'browser/background/background_application_list_model.h',
+        'browser/background/background_contents_service.cc',
+        'browser/background/background_contents_service.h',
+        'browser/background/background_contents_service_factory.cc',
+        'browser/background/background_contents_service_factory.h',
+        'browser/background/background_mode_manager.cc',
+        'browser/background/background_mode_manager.h',
+        'browser/background/background_mode_manager_chromeos.cc',
+        'browser/background/background_mode_manager_aura.cc',
+        'browser/background/background_mode_manager_gtk.cc',
+        'browser/background/background_mode_manager_mac.mm',
+        'browser/background/background_mode_manager_win.cc',
+        'browser/bookmarks/base_bookmark_model_observer.cc',
+        'browser/bookmarks/base_bookmark_model_observer.h',
+        'browser/bookmarks/bookmark_codec.cc',
+        'browser/bookmarks/bookmark_codec.h',
+        'browser/bookmarks/bookmark_expanded_state_tracker.cc',
+        'browser/bookmarks/bookmark_expanded_state_tracker.h',
+        'browser/bookmarks/bookmark_html_writer.cc',
+        'browser/bookmarks/bookmark_html_writer.h',
+        'browser/bookmarks/bookmark_index.cc',
+        'browser/bookmarks/bookmark_index.h',
+        'browser/bookmarks/bookmark_model.cc',
+        'browser/bookmarks/bookmark_model.h',
+        'browser/bookmarks/bookmark_model_factory.cc',
+        'browser/bookmarks/bookmark_model_factory.h',
+        'browser/bookmarks/bookmark_model_observer.h',
+        'browser/bookmarks/bookmark_node_data.cc',
+        'browser/bookmarks/bookmark_node_data.h',
+        'browser/bookmarks/bookmark_node_data_mac.cc',
+        'browser/bookmarks/bookmark_node_data_views.cc',
+        'browser/bookmarks/bookmark_pasteboard_helper_mac.h',
+        'browser/bookmarks/bookmark_pasteboard_helper_mac.mm',
+        'browser/bookmarks/bookmark_prompt_prefs.cc',
+        'browser/bookmarks/bookmark_prompt_prefs.h',
+        'browser/bookmarks/bookmark_service.cc',
+        'browser/bookmarks/bookmark_service.h',
+        'browser/bookmarks/bookmark_storage.cc',
+        'browser/bookmarks/bookmark_storage.h',
+        'browser/bookmarks/bookmark_title_match.cc',
+        'browser/bookmarks/bookmark_title_match.h',
+        'browser/bookmarks/bookmark_utils.cc',
+        'browser/bookmarks/bookmark_utils.h',
+        'browser/browser_about_handler.cc',
+        'browser/browser_about_handler.h',
+        'browser/browser_process.cc',
+        'browser/browser_process.h',
+        'browser/browser_process_impl.cc',
+        'browser/browser_process_impl.h',
+        'browser/browser_process_platform_part.h',
+        'browser/browser_process_platform_part_android.cc',
+        'browser/browser_process_platform_part_android.h',
+        'browser/browser_process_platform_part_aurawin.cc',
+        'browser/browser_process_platform_part_aurawin.h',
+        'browser/browser_process_platform_part_base.cc',
+        'browser/browser_process_platform_part_base.h',
+        'browser/browser_process_platform_part_chromeos.cc',
+        'browser/browser_process_platform_part_chromeos.h',
+        'browser/browser_process_platform_part_mac.h',
+        'browser/browser_process_platform_part_mac.mm',
+        'browser/browser_shutdown.cc',
+        'browser/browser_shutdown.h',
+        'browser/browser_util_win.cc',
+        'browser/browser_util_win.h',
+        'browser/browsing_data/browsing_data_appcache_helper.cc',
+        'browser/browsing_data/browsing_data_appcache_helper.h',
+        'browser/browsing_data/browsing_data_database_helper.cc',
+        'browser/browsing_data/browsing_data_database_helper.h',
+        'browser/browsing_data/browsing_data_file_system_helper.cc',
+        'browser/browsing_data/browsing_data_file_system_helper.h',
+        'browser/browsing_data/browsing_data_flash_lso_helper.cc',
+        'browser/browsing_data/browsing_data_flash_lso_helper.h',
+        'browser/browsing_data/browsing_data_helper.cc',
+        'browser/browsing_data/browsing_data_helper.h',
+        'browser/browsing_data/browsing_data_indexed_db_helper.cc',
+        'browser/browsing_data/browsing_data_indexed_db_helper.h',
+        'browser/browsing_data/browsing_data_local_storage_helper.cc',
+        'browser/browsing_data/browsing_data_local_storage_helper.h',
+        'browser/browsing_data/local_data_container.cc',
+        'browser/browsing_data/local_data_container.h',
+        'browser/browsing_data/browsing_data_quota_helper.cc',
+        'browser/browsing_data/browsing_data_quota_helper.h',
+        'browser/browsing_data/browsing_data_quota_helper_impl.cc',
+        'browser/browsing_data/browsing_data_quota_helper_impl.h',
+        'browser/browsing_data/browsing_data_remover.cc',
+        'browser/browsing_data/browsing_data_remover.h',
+        'browser/browsing_data/browsing_data_server_bound_cert_helper.cc',
+        'browser/browsing_data/browsing_data_server_bound_cert_helper.h',
+        'browser/browsing_data/browsing_data_cookie_helper.cc',
+        'browser/browsing_data/browsing_data_cookie_helper.h',
+        'browser/browsing_data/cookies_tree_model.cc',
+        'browser/browsing_data/cookies_tree_model.h',
+        'browser/feedback/feedback_data.cc',
+        'browser/feedback/feedback_data.h',
+        'browser/feedback/feedback_util.cc',
+        'browser/feedback/feedback_util.h',
+        'browser/feedback/tracing_manager.cc',
+        'browser/feedback/tracing_manager.h',
+        'browser/captive_portal/captive_portal_detector.cc',
+        'browser/captive_portal/captive_portal_detector.h',
+        'browser/captive_portal/captive_portal_login_detector.cc',
+        'browser/captive_portal/captive_portal_login_detector.h',
+        'browser/captive_portal/captive_portal_service.cc',
+        'browser/captive_portal/captive_portal_service.h',
+        'browser/captive_portal/captive_portal_service_factory.cc',
+        'browser/captive_portal/captive_portal_service_factory.h',
+        'browser/captive_portal/captive_portal_tab_helper.cc',
+        'browser/captive_portal/captive_portal_tab_helper.h',
+        'browser/captive_portal/captive_portal_tab_reloader.cc',
+        'browser/captive_portal/captive_portal_tab_reloader.h',
+        'browser/certificate_manager_model.cc',
+        'browser/certificate_manager_model.h',
+        'browser/certificate_viewer.cc',
+        'browser/certificate_viewer.h',
+        'browser/character_encoding.cc',
+        'browser/character_encoding.h',
+        'browser/chrome_net_benchmarking_message_filter.cc',
+        'browser/chrome_net_benchmarking_message_filter.h',
+        'browser/chrome_browser_application_mac.h',
+        'browser/chrome_browser_application_mac.mm',
+        'browser/chrome_browser_field_trials.cc',
+        'browser/chrome_browser_field_trials.h',
+        'browser/chrome_browser_field_trials_desktop.cc',
+        'browser/chrome_browser_field_trials_desktop.h',
+        'browser/chrome_browser_field_trials_mobile.cc',
+        'browser/chrome_browser_field_trials_mobile.h',
+        'browser/chrome_browser_main.cc',
+        'browser/chrome_browser_main.h',
+        'browser/chrome_browser_main_android.cc',
+        'browser/chrome_browser_main_android.h',
+        'browser/chrome_browser_main_extra_parts.h',
+        'browser/chrome_browser_main_extra_parts_x11.cc',
+        'browser/chrome_browser_main_extra_parts_x11.h',
+        'browser/chrome_browser_main_linux.cc',
+        'browser/chrome_browser_main_linux.h',
+        'browser/chrome_browser_main_mac.h',
+        'browser/chrome_browser_main_mac.mm',
+        'browser/chrome_browser_main_posix.cc',
+        'browser/chrome_browser_main_posix.h',
+        'browser/chrome_browser_main_win.cc',
+        'browser/chrome_browser_main_win.h',
+        'browser/chrome_content_browser_client.cc',
+        'browser/chrome_content_browser_client.h',
+        'browser/chrome_notification_types.h',
+        'browser/chrome_page_zoom.cc',
+        'browser/chrome_page_zoom.h',
+        'browser/chrome_page_zoom_constants.cc',
+        'browser/chrome_page_zoom_constants.h',
+        'browser/chrome_process_singleton.cc',
+        'browser/chrome_process_singleton.h',
+        'browser/chrome_quota_permission_context.cc',
+        'browser/chrome_quota_permission_context.h',
+        'browser/command_observer.h',
+        'browser/command_updater.cc',
+        'browser/command_updater.h',
+        'browser/command_updater_delegate.h',
+        'browser/common/cancelable_request.cc',
+        'browser/common/cancelable_request.h',
+        'browser/component_updater/component_patcher.cc',
+        'browser/component_updater/component_patcher.h',
+        'browser/component_updater/component_patcher_operation.cc',
+        'browser/component_updater/component_patcher_operation.h',
+        'browser/component_updater/component_patcher_win.cc',
+        'browser/component_updater/component_patcher_win.h',
+        'browser/component_updater/component_updater_configurator.cc',
+        'browser/component_updater/component_updater_configurator.h',
+        'browser/component_updater/component_unpacker.cc',
+        'browser/component_updater/component_unpacker.h',
+        'browser/component_updater/component_updater_ping_manager.cc',
+        'browser/component_updater/component_updater_ping_manager.h',
+        'browser/component_updater/component_updater_service.cc',
+        'browser/component_updater/component_updater_service.h',
+        'browser/component_updater/crx_update_item.h',
+        'browser/component_updater/flash_component_installer.h',
+        'browser/component_updater/pepper_flash_component_installer.cc',
+        'browser/component_updater/pnacl/pnacl_component_installer.cc',
+        'browser/component_updater/pnacl/pnacl_component_installer.h',
+        'browser/component_updater/pnacl/pnacl_profile_observer.cc',
+        'browser/component_updater/pnacl/pnacl_profile_observer.h',
+        'browser/component_updater/pnacl/pnacl_updater_observer.cc',
+        'browser/component_updater/pnacl/pnacl_updater_observer.h',
+        'browser/component_updater/ppapi_utils.cc',
+        'browser/component_updater/ppapi_utils.h',
+        'browser/component_updater/recovery_component_installer.cc',
+        'browser/component_updater/recovery_component_installer.h',
+        'browser/component_updater/swiftshader_component_installer.cc',
+        'browser/component_updater/swiftshader_component_installer.h',
+        'browser/component_updater/widevine_cdm_component_installer.cc',
+        'browser/component_updater/widevine_cdm_component_installer.h',
+        'browser/content_settings/content_settings_default_provider.cc',
+        'browser/content_settings/content_settings_default_provider.h',
+        'browser/content_settings/content_settings_details.cc',
+        'browser/content_settings/content_settings_details.h',
+        'browser/content_settings/content_settings_custom_extension_provider.cc',
+        'browser/content_settings/content_settings_custom_extension_provider.h',
+        'browser/content_settings/content_settings_observable_provider.cc',
+        'browser/content_settings/content_settings_observable_provider.h',
+        'browser/content_settings/content_settings_observer.h',
+        'browser/content_settings/content_settings_origin_identifier_value_map.cc',
+        'browser/content_settings/content_settings_origin_identifier_value_map.h',
+        'browser/content_settings/content_settings_internal_extension_provider.cc',
+        'browser/content_settings/content_settings_internal_extension_provider.h',
+        'browser/content_settings/content_settings_policy_provider.cc',
+        'browser/content_settings/content_settings_policy_provider.h',
+        'browser/content_settings/content_settings_pref_provider.cc',
+        'browser/content_settings/content_settings_pref_provider.h',
+        'browser/content_settings/content_settings_provider.h',
+        'browser/content_settings/content_settings_rule.cc',
+        'browser/content_settings/content_settings_rule.h',
+        'browser/content_settings/content_settings_usages_state.cc',
+        'browser/content_settings/content_settings_usages_state.h',
+        'browser/content_settings/content_settings_utils.cc',
+        'browser/content_settings/content_settings_utils.h',
+        'browser/content_settings/cookie_settings.cc',
+        'browser/content_settings/cookie_settings.h',
+        'browser/content_settings/host_content_settings_map.cc',
+        'browser/content_settings/host_content_settings_map.h',
+        'browser/content_settings/local_shared_objects_container.cc',
+        'browser/content_settings/local_shared_objects_container.h',
+        'browser/content_settings/permission_queue_controller.cc',
+        'browser/content_settings/permission_queue_controller.h',
+        'browser/content_settings/permission_request_id.cc',
+        'browser/content_settings/permission_request_id.h',
+        'browser/content_settings/tab_specific_content_settings.cc',
+        'browser/content_settings/tab_specific_content_settings.h',
+        'browser/crash_upload_list.cc',
+        'browser/crash_upload_list.h',
+        'browser/crash_upload_list_win.cc',
+        'browser/crash_upload_list_win.h',
+        'browser/custom_handlers/protocol_handler_registry.cc',
+        'browser/custom_handlers/protocol_handler_registry.h',
+        'browser/custom_handlers/protocol_handler_registry_factory.cc',
+        'browser/custom_handlers/protocol_handler_registry_factory.h',
+        'browser/custom_handlers/register_protocol_handler_infobar_delegate.cc',
+        'browser/custom_handlers/register_protocol_handler_infobar_delegate.h',
+        'browser/custom_home_pages_table_model.cc',
+        'browser/custom_home_pages_table_model.h',
+        'browser/defaults.cc',
+        'browser/defaults.h',
+        'browser/diagnostics/diagnostics_controller.cc',
+        'browser/diagnostics/diagnostics_controller.h',
+        'browser/diagnostics/diagnostics_model.cc',
+        'browser/diagnostics/diagnostics_model.h',
+        'browser/diagnostics/diagnostics_test.cc',
+        'browser/diagnostics/diagnostics_test.h',
+        'browser/diagnostics/diagnostics_writer.cc',
+        'browser/diagnostics/diagnostics_writer.h',
+        'browser/diagnostics/recon_diagnostics.cc',
+        'browser/diagnostics/recon_diagnostics.h',
+        'browser/diagnostics/sqlite_diagnostics.cc',
+        'browser/diagnostics/sqlite_diagnostics.h',
+        'browser/download/chrome_download_manager_delegate.cc',
+        'browser/download/chrome_download_manager_delegate.h',
+        'browser/download/download_completion_blocker.cc',
+        'browser/download/download_completion_blocker.h',
+        'browser/download/download_crx_util.cc',
+        'browser/download/download_crx_util.h',
+        'browser/download/download_crx_util_android.cc',
+        'browser/download/download_danger_prompt.cc',
+        'browser/download/download_danger_prompt.h',
+        'browser/download/download_extensions.cc',
+        'browser/download/download_extensions.h',
+        'browser/download/download_file_picker.cc',
+        'browser/download/download_file_picker.h',
+        'browser/download/download_history.cc',
+        'browser/download/download_history.h',
+        'browser/download/download_item_model.cc',
+        'browser/download/download_item_model.h',
+        'browser/download/download_path_reservation_tracker.cc',
+        'browser/download/download_path_reservation_tracker.h',
+        'browser/download/download_prefs.cc',
+        'browser/download/download_prefs.h',
+        'browser/download/download_query.cc',
+        'browser/download/download_query.h',
+        'browser/download/download_request_infobar_delegate.cc',
+        'browser/download/download_request_infobar_delegate.h',
+        'browser/download/download_request_limiter.cc',
+        'browser/download/download_request_limiter.h',
+        'browser/download/download_resource_throttle.cc',
+        'browser/download/download_resource_throttle.h',
+        'browser/download/download_service.cc',
+        'browser/download/download_service.h',
+        'browser/download/download_service_factory.cc',
+        'browser/download/download_service_factory.h',
+        'browser/download/download_shelf.cc',
+        'browser/download/download_shelf.h',
+        'browser/download/download_shelf_context_menu.cc',
+        'browser/download/download_shelf_context_menu.h',
+        'browser/download/download_started_animation.h',
+        'browser/download/download_stats.cc',
+        'browser/download/download_stats.h',
+        'browser/download/download_status_updater.cc',
+        'browser/download/download_status_updater.h',
+        'browser/download/download_status_updater_gtk.cc',
+        'browser/download/download_status_updater_mac.mm',
+        'browser/download/download_status_updater_win.cc',
+        'browser/download/download_target_determiner.cc',
+        'browser/download/download_target_determiner.h',
+        'browser/download/download_target_determiner_delegate.h',
+        'browser/download/download_ui_controller.cc',
+        'browser/download/download_ui_controller.h',
+        'browser/download/download_util.cc',
+        'browser/download/download_util.h',
+        'browser/download/all_download_item_notifier.cc',
+        'browser/download/all_download_item_notifier.h',
+        'browser/download/save_package_file_picker.cc',
+        'browser/download/save_package_file_picker.h',
+        'browser/drive/drive_api_service.cc',
+        'browser/drive/drive_api_service.h',
+        'browser/drive/drive_api_util.cc',
+        'browser/drive/drive_api_util.h',
+        'browser/drive/drive_notification_manager.cc',
+        'browser/drive/drive_notification_manager.h',
+        'browser/drive/drive_notification_manager_factory.cc',
+        'browser/drive/drive_notification_manager_factory.h',
+        'browser/drive/drive_notification_observer.h',
+        'browser/drive/drive_service_interface.h',
+        'browser/drive/drive_switches.cc',
+        'browser/drive/drive_switches.h',
+        'browser/drive/drive_uploader.cc',
+        'browser/drive/drive_uploader.h',
+        'browser/drive/event_logger.cc',
+        'browser/drive/event_logger.h',
+        'browser/drive/gdata_wapi_service.cc',
+        'browser/drive/gdata_wapi_service.h',
+        'browser/enumerate_modules_model_win.cc',
+        'browser/enumerate_modules_model_win.h',
+        'browser/extensions/scoped_gaia_auth_extension.cc',
+        'browser/extensions/scoped_gaia_auth_extension.h',
+        'browser/extensions/token_cache/token_cache_service.cc',
+        'browser/extensions/token_cache/token_cache_service.h',
+        'browser/extensions/token_cache/token_cache_service_factory.cc',
+        'browser/extensions/token_cache/token_cache_service_factory.h',
+        'browser/external_protocol/external_protocol_handler.cc',
+        'browser/external_protocol/external_protocol_handler.h',
+        'browser/external_protocol/external_protocol_observer.cc',
+        'browser/external_protocol/external_protocol_observer.h',
+        'browser/external_tab/external_tab_container.h',
+        'browser/favicon/favicon_changed_details.cc',
+        'browser/favicon/favicon_changed_details.h',
+        'browser/favicon/favicon_handler.cc',
+        'browser/favicon/favicon_handler.h',
+        'browser/favicon/favicon_handler_delegate.h',
+        'browser/favicon/favicon_service.cc',
+        'browser/favicon/favicon_service.h',
+        'browser/favicon/favicon_service_factory.cc',
+        'browser/favicon/favicon_service_factory.h',
+        'browser/favicon/favicon_tab_helper.cc',
+        'browser/favicon/favicon_tab_helper.h',
+        'browser/favicon/favicon_util.cc',
+        'browser/favicon/favicon_util.h',
+        'browser/file_select_helper.cc',
+        'browser/file_select_helper.h',
+        'browser/first_run/first_run.cc',
+        'browser/first_run/first_run.h',
+        'browser/first_run/first_run_dialog.h',
+        'browser/first_run/first_run_internal.h',
+        'browser/first_run/first_run_internal_linux.cc',
+        'browser/first_run/first_run_internal_mac.mm',
+        'browser/first_run/first_run_internal_posix.cc',
+        'browser/first_run/first_run_internal_win.cc',
+        'browser/first_run/try_chrome_dialog_view.cc',
+        'browser/first_run/try_chrome_dialog_view.h',
+        'browser/first_run/upgrade_util.cc',
+        'browser/first_run/upgrade_util.h',
+        'browser/first_run/upgrade_util_linux.cc',
+        'browser/first_run/upgrade_util_linux.h',
+        'browser/first_run/upgrade_util_mac.cc',
+        'browser/first_run/upgrade_util_win.cc',
+        'browser/first_run/upgrade_util_win.h',
+        'browser/flags_storage.h',
+        'browser/fullscreen.h',
+        'browser/fullscreen_aura.cc',
+        'browser/fullscreen_chromeos.cc',
+        'browser/fullscreen_gtk.cc',
+        'browser/fullscreen_mac.mm',
+        'browser/fullscreen_win.cc',
+        'browser/geolocation/chrome_access_token_store.cc',
+        'browser/geolocation/chrome_access_token_store.h',
+        'browser/geolocation/chrome_geolocation_permission_context.cc',
+        'browser/geolocation/chrome_geolocation_permission_context.h',
+        'browser/geolocation/chrome_geolocation_permission_context_android.cc',
+        'browser/geolocation/chrome_geolocation_permission_context_android.h',
+        'browser/geolocation/chrome_geolocation_permission_context_factory.cc',
+        'browser/geolocation/chrome_geolocation_permission_context_factory.h',
+        'browser/geolocation/geolocation_infobar_delegate.cc',
+        'browser/geolocation/geolocation_infobar_delegate.h',
+        'browser/geolocation/geolocation_infobar_delegate_android.cc',
+        'browser/geolocation/geolocation_infobar_delegate_android.h',
+        'browser/geolocation/geolocation_prefs.cc',
+        'browser/geolocation/geolocation_prefs.h',
+        'browser/global_keyboard_shortcuts_mac.h',
+        'browser/global_keyboard_shortcuts_mac.mm',
+        'browser/google/google_search_counter.cc',
+        'browser/google/google_search_counter.h',
+        'browser/google/google_search_metrics.cc',
+        'browser/google/google_search_metrics.h',
+        'browser/google/google_update_settings_posix.cc',
+        'browser/google/google_update_win.cc',
+        'browser/google/google_update_win.h',
+        'browser/google/google_url_tracker.cc',
+        'browser/google/google_url_tracker.h',
+        'browser/google/google_url_tracker_factory.cc',
+        'browser/google/google_url_tracker_factory.h',
+        'browser/google/google_url_tracker_infobar_delegate.cc',
+        'browser/google/google_url_tracker_infobar_delegate.h',
+        'browser/google/google_url_tracker_map_entry.cc',
+        'browser/google/google_url_tracker_map_entry.h',
+        'browser/google/google_url_tracker_navigation_helper.h',
+        'browser/google/google_url_tracker_navigation_helper_impl.cc',
+        'browser/google/google_url_tracker_navigation_helper_impl.h',
+        'browser/google/google_util.cc',
+        'browser/google/google_util.h',
+        'browser/google/google_util_chromeos.cc',
+        'browser/google/google_util_chromeos.h',
+        'browser/google_apis/auth_service.cc',
+        'browser/google_apis/auth_service.h',
+        'browser/google_apis/auth_service_interface.h',
+        'browser/google_apis/auth_service_observer.h',
+        'browser/google_apis/base_requests.cc',
+        'browser/google_apis/base_requests.h',
+        'browser/google_apis/drive_api_parser.cc',
+        'browser/google_apis/drive_api_parser.h',
+        'browser/google_apis/drive_api_requests.cc',
+        'browser/google_apis/drive_api_requests.h',
+        'browser/google_apis/drive_api_url_generator.cc',
+        'browser/google_apis/drive_api_url_generator.h',
+        'browser/google_apis/drive_common_callbacks.h',
+        'browser/google_apis/drive_entry_kinds.h',
+        'browser/google_apis/gdata_contacts_requests.cc',
+        'browser/google_apis/gdata_contacts_requests.h',
+        'browser/google_apis/gdata_errorcode.cc',
+        'browser/google_apis/gdata_errorcode.h',
+        'browser/google_apis/gdata_wapi_requests.cc',
+        'browser/google_apis/gdata_wapi_requests.h',
+        'browser/google_apis/gdata_wapi_parser.cc',
+        'browser/google_apis/gdata_wapi_parser.h',
+        'browser/google_apis/gdata_wapi_url_generator.cc',
+        'browser/google_apis/gdata_wapi_url_generator.h',
+        'browser/google_apis/request_sender.cc',
+        'browser/google_apis/request_sender.h',
+        'browser/google_apis/request_util.cc',
+        'browser/google_apis/request_util.h',
+        'browser/google_apis/task_util.cc',
+        'browser/google_apis/task_util.h',
+        'browser/google_apis/time_util.cc',
+        'browser/google_apis/time_util.h',
+        'browser/gpu/chrome_gpu_util.cc',
+        'browser/gpu/chrome_gpu_util.h',
+        'browser/gpu/gl_string_manager.cc',
+        'browser/gpu/gl_string_manager.h',
+        'browser/gpu/gpu_feature_checker.cc',
+        'browser/gpu/gpu_feature_checker.h',
+        'browser/gpu/gpu_mode_manager.cc',
+        'browser/gpu/gpu_mode_manager.h',
+        'browser/guestview/adview/adview_constants.cc',
+        'browser/guestview/adview/adview_constants.h',
+        'browser/guestview/adview/adview_guest.cc',
+        'browser/guestview/adview/adview_guest.h',
+        'browser/guestview/guestview_constants.cc',
+        'browser/guestview/guestview_constants.h',
+        'browser/guestview/guestview.cc',
+        'browser/guestview/guestview.h',
+        'browser/guestview/webview/webview_constants.cc',
+        'browser/guestview/webview/webview_constants.h',
+        'browser/guestview/webview/webview_guest.cc',
+        'browser/guestview/webview/webview_guest.h',
+        'browser/hang_monitor/hang_crash_dump_win.cc',
+        'browser/hang_monitor/hang_crash_dump_win.h',
+        'browser/hang_monitor/hung_plugin_action.cc',
+        'browser/hang_monitor/hung_plugin_action.h',
+        'browser/hang_monitor/hung_window_detector.cc',
+        'browser/hang_monitor/hung_window_detector.h',
+        'browser/history/android/android_cache_database.cc',
+        'browser/history/android/android_cache_database.h',
+        'browser/history/android/android_history_provider_service.cc',
+        'browser/history/android/android_history_provider_service.h',
+        'browser/history/android/android_history_types.cc',
+        'browser/history/android/android_history_types.h',
+        'browser/history/android/android_provider_backend.cc',
+        'browser/history/android/android_provider_backend.h',
+        'browser/history/android/android_time.h',
+        'browser/history/android/android_urls_database.cc',
+        'browser/history/android/android_urls_database.h',
+        'browser/history/android/android_urls_sql_handler.cc',
+        'browser/history/android/android_urls_sql_handler.h',
+        'browser/history/android/bookmark_model_sql_handler.cc',
+        'browser/history/android/bookmark_model_sql_handler.h',
+        'browser/history/android/favicon_sql_handler.cc',
+        'browser/history/android/favicon_sql_handler.h',
+        'browser/history/android/sql_handler.cc',
+        'browser/history/android/sql_handler.h',
+        'browser/history/android/sqlite_cursor.cc',
+        'browser/history/android/sqlite_cursor.h',
+        'browser/history/android/urls_sql_handler.cc',
+        'browser/history/android/urls_sql_handler.h',
+        'browser/history/android/visit_sql_handler.cc',
+        'browser/history/android/visit_sql_handler.h',
+        'browser/history/archived_database.cc',
+        'browser/history/archived_database.h',
+        'browser/history/delete_directive_handler.cc',
+        'browser/history/delete_directive_handler.h',
+        'browser/history/download_database.cc',
+        'browser/history/download_database.h',
+        'browser/history/download_row.cc',
+        'browser/history/download_row.h',
+        'browser/history/expire_history_backend.cc',
+        'browser/history/expire_history_backend.h',
+        'browser/history/history_backend.cc',
+        'browser/history/history_backend.h',
+        'browser/history/history_backend_android.cc',
+        'browser/history/history_database.cc',
+        'browser/history/history_database.h',
+        'browser/history/history_db_task.h',
+        'browser/history/history_details.h',
+        'browser/history/history_marshaling.h',
+        'browser/history/history_marshaling_android.h',
+        'browser/history/history_notifications.cc',
+        'browser/history/history_notifications.h',
+        'browser/history/history_publisher.cc',
+        'browser/history/history_publisher.h',
+        'browser/history/history_publisher_none.cc',
+        'browser/history/history_publisher_win.cc',
+        'browser/history/history_service.cc',
+        'browser/history/history_service.h',
+        'browser/history/history_service_factory.cc',
+        'browser/history/history_service_factory.h',
+        'browser/history/history_tab_helper.cc',
+        'browser/history/history_tab_helper.h',
+        'browser/history/history_types.cc',
+        'browser/history/history_types.h',
+        'browser/history/in_memory_database.cc',
+        'browser/history/in_memory_database.h',
+        'browser/history/in_memory_history_backend.cc',
+        'browser/history/in_memory_history_backend.h',
+        'browser/history/in_memory_url_index.cc',
+        'browser/history/in_memory_url_index.h',
+        'browser/history/in_memory_url_index_types.cc',
+        'browser/history/in_memory_url_index_types.h',
+        'browser/history/most_visited_tiles_experiment.cc',
+        'browser/history/most_visited_tiles_experiment.h',
+        'browser/history/page_usage_data.cc',
+        'browser/history/page_usage_data.h',
+        'browser/history/query_parser.cc',
+        'browser/history/query_parser.h',
+        'browser/history/scored_history_match.cc',
+        'browser/history/scored_history_match.h',
+        'browser/history/select_favicon_frames.cc',
+        'browser/history/select_favicon_frames.h',
+        'browser/history/snippet.cc',
+        'browser/history/snippet.h',
+        'browser/history/shortcuts_backend.cc',
+        'browser/history/shortcuts_backend.h',
+        'browser/history/shortcuts_backend_factory.cc',
+        'browser/history/shortcuts_backend_factory.h',
+        'browser/history/shortcuts_database.cc',
+        'browser/history/shortcuts_database.h',
+        'browser/history/thumbnail_database.cc',
+        'browser/history/thumbnail_database.h',
+        'browser/history/top_sites.cc',
+        'browser/history/top_sites.h',
+        'browser/history/top_sites_backend.cc',
+        'browser/history/top_sites_backend.h',
+        'browser/history/top_sites_cache.cc',
+        'browser/history/top_sites_cache.h',
+        'browser/history/top_sites_database.cc',
+        'browser/history/top_sites_database.h',
+        'browser/history/top_sites_impl.cc',
+        'browser/history/top_sites_impl.h',
+        'browser/history/top_sites_likely_impl.cc',
+        'browser/history/top_sites_likely_impl.h',
+        'browser/history/typed_url_syncable_service.cc',
+        'browser/history/typed_url_syncable_service.h',
+        'browser/history/url_database.cc',
+        'browser/history/url_database.h',
+        'browser/history/url_index_private_data.cc',
+        'browser/history/url_index_private_data.h',
+        'browser/history/visit_database.cc',
+        'browser/history/visit_database.h',
+        'browser/history/visit_filter.cc',
+        'browser/history/visit_filter.h',
+        'browser/history/visit_tracker.cc',
+        'browser/history/visit_tracker.h',
+        'browser/history/visitsegment_database.cc',
+        'browser/history/visitsegment_database.h',
+        'browser/history/web_history_service.cc',
+        'browser/history/web_history_service.h',
+        'browser/history/web_history_service_factory.cc',
+        'browser/history/web_history_service_factory.h',
+        'browser/icon_loader.cc',
+        'browser/icon_loader.h',
+        'browser/icon_loader_android.cc',
+        'browser/icon_loader_chromeos.cc',
+        'browser/icon_loader_linux.cc',
+        'browser/icon_loader_mac.mm',
+        'browser/icon_loader_win.cc',
+        'browser/icon_manager.cc',
+        'browser/icon_manager.h',
+        'browser/idle.cc',
+        'browser/idle.h',
+        'browser/idle_android.cc',
+        'browser/idle_chromeos.cc',
+        'browser/idle_linux.cc',
+        'browser/idle_mac.mm',
+        'browser/idle_query_x11.cc',
+        'browser/idle_query_x11.h',
+        'browser/idle_win.cc',
+        'browser/image_decoder.cc',
+        'browser/image_decoder.h',
+        'browser/importer/external_process_importer_client.cc',
+        'browser/importer/external_process_importer_client.h',
+        'browser/importer/external_process_importer_host.cc',
+        'browser/importer/external_process_importer_host.h',
+        'browser/importer/firefox_profile_lock.cc',
+        'browser/importer/firefox_profile_lock.h',
+        'browser/importer/firefox_profile_lock_posix.cc',
+        'browser/importer/firefox_profile_lock_win.cc',
+        'browser/importer/importer_list.cc',
+        'browser/importer/importer_list.h',
+        'browser/importer/importer_list_observer.h',
+        'browser/importer/importer_lock_dialog.h',
+        'browser/importer/importer_progress_observer.h',
+        'browser/importer/importer_uma.cc',
+        'browser/importer/importer_uma.h',
+        'browser/importer/in_process_importer_bridge.cc',
+        'browser/importer/in_process_importer_bridge.h',
+        'browser/importer/profile_writer.cc',
+        'browser/importer/profile_writer.h',
+        'browser/infobars/confirm_infobar_delegate.cc',
+        'browser/infobars/confirm_infobar_delegate.h',
+        'browser/infobars/infobar.cc',
+        'browser/infobars/infobar.h',
+        'browser/infobars/infobar_container.cc',
+        'browser/infobars/infobar_container.h',
+        'browser/infobars/infobar_delegate.cc',
+        'browser/infobars/infobar_delegate.h',
+        'browser/infobars/infobar_service.cc',
+        'browser/infobars/infobar_service.h',
+        'browser/infobars/insecure_content_infobar_delegate.cc',
+        'browser/infobars/insecure_content_infobar_delegate.h',
+        'browser/infobars/simple_alert_infobar_delegate.cc',
+        'browser/infobars/simple_alert_infobar_delegate.h',
+        'browser/internal_auth.cc',
+        'browser/internal_auth.h',
+        'browser/intranet_redirect_detector.cc',
+        'browser/intranet_redirect_detector.h',
+        'browser/invalidation/fake_invalidation_service.cc',
+        'browser/invalidation/fake_invalidation_service.h',
+        'browser/invalidation/invalidation_service.h',
+        'browser/invalidation/invalidation_service_android.cc',
+        'browser/invalidation/invalidation_service_android.h',
+        'browser/invalidation/invalidation_service_factory.cc',
+        'browser/invalidation/invalidation_service_factory.h',
+        'browser/invalidation/invalidation_service_util.cc',
+        'browser/invalidation/invalidation_service_util.h',
+        'browser/invalidation/invalidator_storage.cc',
+        'browser/invalidation/invalidator_storage.h',
+        'browser/invalidation/p2p_invalidation_service.cc',
+        'browser/invalidation/p2p_invalidation_service.h',
+        'browser/invalidation/ticl_invalidation_service.cc',
+        'browser/invalidation/ticl_invalidation_service.h',
+        'browser/io_thread.cc',
+        'browser/io_thread.h',
+        'browser/jankometer.cc',
+        'browser/jankometer.h',
+        'browser/jankometer_android.cc',
+        'browser/jankometer_mac.cc',
+        'browser/jumplist_win.cc',
+        'browser/jumplist_win.h',
+        'browser/language_usage_metrics.cc',
+        'browser/language_usage_metrics.h',
+        'browser/lifetime/application_lifetime.cc',
+        'browser/lifetime/application_lifetime.h',
+        'browser/lifetime/application_lifetime_android.cc',
+        'browser/lifetime/application_lifetime_android.h',
+        'browser/lifetime/application_lifetime_aura.cc',
+        'browser/lifetime/application_lifetime_gtk.cc',
+        'browser/lifetime/application_lifetime_mac.mm',
+        'browser/lifetime/application_lifetime_stub.cc',
+        'browser/lifetime/application_lifetime_win.cc',
+        'browser/local_discovery/privet_confirm_api_flow.cc',
+        'browser/local_discovery/privet_confirm_api_flow.h',
+        'browser/local_discovery/privet_constants.h',
+        'browser/local_discovery/privet_constants.cc',
+        'browser/local_discovery/privet_url_fetcher.cc',
+        'browser/local_discovery/privet_url_fetcher.h',
+        'browser/local_discovery/privet_http.h',
+        'browser/local_discovery/privet_http_impl.h',
+        'browser/local_discovery/privet_http_impl.cc',
+        'browser/mac/dock.h',
+        'browser/mac/dock.mm',
+        'browser/mac/install_from_dmg.h',
+        'browser/mac/install_from_dmg.mm',
+        'browser/mac/keychain_reauthorize.h',
+        'browser/mac/keychain_reauthorize.mm',
+        'browser/mac/keystone_glue.h',
+        'browser/mac/keystone_glue.mm',
+        'browser/mac/keystone_registration.h',
+        'browser/mac/keystone_registration.mm',
+        'browser/mac/master_prefs.h',
+        'browser/mac/master_prefs.mm',
+        'browser/mac/relauncher.cc',
+        'browser/mac/relauncher.h',
+        'browser/mac/security_wrappers.cc',
+        'browser/mac/security_wrappers.h',
+        'browser/managed_mode/custodian_profile_downloader_service.cc',
+        'browser/managed_mode/custodian_profile_downloader_service.h',
+        'browser/managed_mode/custodian_profile_downloader_service_factory.cc',
+        'browser/managed_mode/custodian_profile_downloader_service_factory.h',
+        'browser/managed_mode/managed_mode_interstitial.cc',
+        'browser/managed_mode/managed_mode_interstitial.h',
+        'browser/managed_mode/managed_mode_navigation_observer.cc',
+        'browser/managed_mode/managed_mode_navigation_observer.h',
+        'browser/managed_mode/managed_mode_resource_throttle.cc',
+        'browser/managed_mode/managed_mode_resource_throttle.h',
+        'browser/managed_mode/managed_mode_site_list.cc',
+        'browser/managed_mode/managed_mode_site_list.h',
+        'browser/managed_mode/managed_mode_url_filter.cc',
+        'browser/managed_mode/managed_mode_url_filter.h',
+        'browser/managed_mode/managed_user_refresh_token_fetcher.cc',
+        'browser/managed_mode/managed_user_refresh_token_fetcher.h',
+        'browser/managed_mode/managed_user_registration_utility.cc',
+        'browser/managed_mode/managed_user_registration_utility.h',
+        'browser/managed_mode/managed_user_service.cc',
+        'browser/managed_mode/managed_user_service.h',
+        'browser/managed_mode/managed_user_service_factory.cc',
+        'browser/managed_mode/managed_user_service_factory.h',
+        'browser/managed_mode/managed_user_sync_service.cc',
+        'browser/managed_mode/managed_user_sync_service.h',
+        'browser/managed_mode/managed_user_sync_service_factory.cc',
+        'browser/managed_mode/managed_user_sync_service_factory.h',
+        'browser/managed_mode/managed_user_sync_service_observer.h',
+        'browser/managed_mode/managed_user_theme.cc',
+        'browser/managed_mode/managed_user_theme.h',
+        'browser/managed_mode/managed_users.h',
+        'browser/media/audio_stream_indicator.cc',
+        'browser/media/audio_stream_indicator.h',
+        'browser/media/chrome_midi_permission_context.cc',
+        'browser/media/chrome_midi_permission_context.h',
+        'browser/media/chrome_midi_permission_context_factory.cc',
+        'browser/media/chrome_midi_permission_context_factory.h',
+        'browser/media/desktop_streams_registry.cc',
+        'browser/media/desktop_streams_registry.h',
+        'browser/media/desktop_media_picker.h',
+        'browser/media/desktop_media_picker_model.cc',
+        'browser/media/desktop_media_picker_model.h',
+        'browser/media/media_capture_devices_dispatcher.cc',
+        'browser/media/media_capture_devices_dispatcher.h',
+        'browser/media/media_stream_capture_indicator.cc',
+        'browser/media/media_stream_capture_indicator.h',
+        'browser/media/media_stream_devices_controller.cc',
+        'browser/media/media_stream_devices_controller.h',
+        'browser/media/media_stream_infobar_delegate.cc',
+        'browser/media/media_stream_infobar_delegate.h',
+        'browser/media/midi_permission_infobar_delegate.cc',
+        'browser/media/midi_permission_infobar_delegate.h',
+        'browser/media/webrtc_log_upload_list.cc',
+        'browser/media/webrtc_log_upload_list.h',
+        'browser/media/webrtc_log_uploader.cc',
+        'browser/media/webrtc_log_uploader.h',
+        'browser/media/webrtc_logging_handler_host.cc',
+        'browser/media/webrtc_logging_handler_host.h',
+        'browser/media_galleries/fileapi/av_scanning_file_validator.cc',
+        'browser/media_galleries/fileapi/av_scanning_file_validator.h',
+        'browser/media_galleries/fileapi/device_media_async_file_util.cc',
+        'browser/media_galleries/fileapi/device_media_async_file_util.h',
+        'browser/media_galleries/fileapi/itunes_finder.cc',
+        'browser/media_galleries/fileapi/itunes_finder.h',
+        'browser/media_galleries/fileapi/itunes_finder_mac.h',
+        'browser/media_galleries/fileapi/itunes_finder_mac.mm',
+        'browser/media_galleries/fileapi/itunes_finder_win.cc',
+        'browser/media_galleries/fileapi/itunes_finder_win.h',
+        'browser/media_galleries/fileapi/media_file_system_backend.cc',
+        'browser/media_galleries/fileapi/media_file_system_backend.h',
+        'browser/media_galleries/fileapi/media_file_validator_factory.h',
+        'browser/media_galleries/fileapi/media_file_validator_factory.cc',
+        'browser/media_galleries/fileapi/media_path_filter.cc',
+        'browser/media_galleries/fileapi/media_path_filter.h',
+        'browser/media_galleries/fileapi/mtp_device_async_delegate.h',
+        'browser/media_galleries/fileapi/mtp_device_map_service.cc',
+        'browser/media_galleries/fileapi/mtp_device_map_service.h',
+        'browser/media_galleries/fileapi/native_media_file_util.cc',
+        'browser/media_galleries/fileapi/native_media_file_util.h',
+        'browser/media_galleries/fileapi/picasa/picasa_finder.cc',
+        'browser/media_galleries/fileapi/picasa/picasa_finder.h',
+        'browser/media_galleries/fileapi/safe_audio_video_checker.cc',
+        'browser/media_galleries/fileapi/safe_audio_video_checker.h',
+        'browser/media_galleries/fileapi/safe_itunes_pref_parser_win.cc',
+        'browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h',
+        'browser/media_galleries/fileapi/supported_audio_video_checker.cc',
+        'browser/media_galleries/fileapi/supported_audio_video_checker.h',
+        'browser/media_galleries/fileapi/supported_image_type_validator.cc',
+        'browser/media_galleries/fileapi/supported_image_type_validator.h',
+        'browser/media_galleries/imported_media_gallery_registry.cc',
+        'browser/media_galleries/imported_media_gallery_registry.h',
+        'browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc',
+        'browser/media_galleries/linux/mtp_device_delegate_impl_linux.h',
+        'browser/media_galleries/linux/mtp_device_object_enumerator.cc',
+        'browser/media_galleries/linux/mtp_device_object_enumerator.h',
+        'browser/media_galleries/linux/mtp_device_task_helper.cc',
+        'browser/media_galleries/linux/mtp_device_task_helper.h',
+        'browser/media_galleries/linux/mtp_device_task_helper_map_service.cc',
+        'browser/media_galleries/linux/mtp_device_task_helper_map_service.h',
+        'browser/media_galleries/linux/mtp_read_file_worker.cc',
+        'browser/media_galleries/linux/mtp_read_file_worker.h',
+        'browser/media_galleries/linux/snapshot_file_details.cc',
+        'browser/media_galleries/linux/snapshot_file_details.h',
+        'browser/media_galleries/mac/mtp_device_delegate_impl_mac.h',
+        'browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm',
+        'browser/media_galleries/media_file_system_registry.cc',
+        'browser/media_galleries/media_file_system_registry.h',
+        'browser/media_galleries/media_galleries_dialog_controller.cc',
+        'browser/media_galleries/media_galleries_dialog_controller.h',
+        'browser/media_galleries/media_galleries_preferences.cc',
+        'browser/media_galleries/media_galleries_preferences.h',
+        'browser/media_galleries/media_galleries_preferences_factory.cc',
+        'browser/media_galleries/media_galleries_preferences_factory.h',
+        'browser/media_galleries/mtp_device_delegate_impl.h',
+        'browser/media_galleries/scoped_mtp_device_map_entry.cc',
+        'browser/media_galleries/scoped_mtp_device_map_entry.h',
+        'browser/media_galleries/win/mtp_device_delegate_impl_win.cc',
+        'browser/media_galleries/win/mtp_device_delegate_impl_win.h',
+        'browser/media_galleries/win/mtp_device_object_entry.cc',
+        'browser/media_galleries/win/mtp_device_object_entry.h',
+        'browser/media_galleries/win/mtp_device_object_enumerator.cc',
+        'browser/media_galleries/win/mtp_device_object_enumerator.h',
+        'browser/media_galleries/win/mtp_device_operations_util.cc',
+        'browser/media_galleries/win/mtp_device_operations_util.h',
+        'browser/media_galleries/win/portable_device_map_service.cc',
+        'browser/media_galleries/win/portable_device_map_service.h',
+        'browser/media_galleries/win/snapshot_file_details.cc',
+        'browser/media_galleries/win/snapshot_file_details.h',
+        'browser/memory_details.cc',
+        'browser/memory_details.h',
+        'browser/memory_details_android.cc',
+        'browser/memory_details_linux.cc',
+        'browser/memory_details_mac.cc',
+        'browser/memory_details_win.cc',
+        'browser/memory_purger.cc',
+        'browser/memory_purger.h',
+        'browser/metrics/chrome_browser_main_extra_parts_metrics.cc',
+        'browser/metrics/chrome_browser_main_extra_parts_metrics.h',
+        'browser/metrics/compression_utils.cc',
+        'browser/metrics/compression_utils.h',
+        'browser/metrics/field_trial_synchronizer.cc',
+        'browser/metrics/field_trial_synchronizer.h',
+        'browser/metrics/gzipped_protobufs_field_trial.cc',
+        'browser/metrics/gzipped_protobufs_field_trial.h',
+        'browser/metrics/metric_event_duration_details.h',
+        'browser/metrics/metrics_log.cc',
+        'browser/metrics/metrics_log.h',
+        'browser/metrics/metrics_log_serializer.cc',
+        'browser/metrics/metrics_log_serializer.h',
+        'browser/metrics/metrics_network_observer.cc',
+        'browser/metrics/metrics_network_observer.h',
+        'browser/metrics/metrics_reporting_scheduler.cc',
+        'browser/metrics/metrics_reporting_scheduler.h',
+        'browser/metrics/metrics_service.cc',
+        'browser/metrics/metrics_service.h',
+        'browser/metrics/perf_provider_chromeos.cc',
+        'browser/metrics/perf_provider_chromeos.h',
+        'browser/metrics/thread_watcher.cc',
+        'browser/metrics/thread_watcher.h',
+        'browser/metrics/time_ticks_experiment_win.cc',
+        'browser/metrics/time_ticks_experiment_win.h',
+        'browser/metrics/tracking_synchronizer.cc',
+        'browser/metrics/tracking_synchronizer.h',
+        'browser/metrics/tracking_synchronizer_observer.h',
+        'browser/metrics/variations/variations_http_header_provider.cc',
+        'browser/metrics/variations/variations_http_header_provider.h',
+        'browser/metrics/variations/variations_registry_syncer_win.cc',
+        'browser/metrics/variations/variations_registry_syncer_win.h',
+        'browser/metrics/variations/variations_request_scheduler.cc',
+        'browser/metrics/variations/variations_request_scheduler.h',
+        'browser/metrics/variations/variations_request_scheduler_mobile.cc',
+        'browser/metrics/variations/variations_request_scheduler_mobile.h',
+        'browser/metrics/variations/variations_seed_processor.cc',
+        'browser/metrics/variations/variations_seed_processor.h',
+        'browser/metrics/variations/variations_service.cc',
+        'browser/metrics/variations/variations_service.h',
+        'browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc',
+        'browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h',
+        'browser/native_window_notification_source.h',
+        'browser/net/about_protocol_handler.cc',
+        'browser/net/about_protocol_handler.h',
+        'browser/net/async_dns_field_trial.cc',
+        'browser/net/async_dns_field_trial.h',
+        'browser/net/basic_http_user_agent_settings.cc',
+        'browser/net/basic_http_user_agent_settings.h',
+        'browser/net/chrome_cookie_notification_details.h',
+        'browser/net/chrome_fraudulent_certificate_reporter.cc',
+        'browser/net/chrome_fraudulent_certificate_reporter.h',
+        'browser/net/chrome_http_user_agent_settings.cc',
+        'browser/net/chrome_http_user_agent_settings.h',
+        'browser/net/chrome_net_log.cc',
+        'browser/net/chrome_net_log.h',
+        'browser/net/chrome_network_delegate.cc',
+        'browser/net/chrome_network_delegate.h',
+        'browser/net/chrome_url_request_context.cc',
+        'browser/net/chrome_url_request_context.h',
+        'browser/net/connect_interceptor.cc',
+        'browser/net/connect_interceptor.h',
+        'browser/net/connection_tester.cc',
+        'browser/net/connection_tester.h',
+        'browser/net/crl_set_fetcher.cc',
+        'browser/net/crl_set_fetcher.h',
+        'browser/net/dns_probe_runner.cc',
+        'browser/net/dns_probe_runner.h',
+        'browser/net/dns_probe_service.cc',
+        'browser/net/dns_probe_service.h',
+        'browser/net/evicted_domain_cookie_counter.cc',
+        'browser/net/evicted_domain_cookie_counter.h',
+        'browser/net/firefox_proxy_settings.cc',
+        'browser/net/firefox_proxy_settings.h',
+        'browser/net/gaia/gaia_oauth_consumer.h',
+        'browser/net/gaia/gaia_oauth_fetcher.cc',
+        'browser/net/gaia/gaia_oauth_fetcher.h',
+        'browser/net/http_pipelining_compatibility_client.cc',
+        'browser/net/http_pipelining_compatibility_client.h',
+        'browser/net/http_server_properties_manager.cc',
+        'browser/net/http_server_properties_manager.h',
+        'browser/net/load_time_stats.cc',
+        'browser/net/load_time_stats.h',
+        'browser/net/net_error_tab_helper.cc',
+        'browser/net/net_error_tab_helper.h',
+        'browser/net/net_log_temp_file.cc',
+        'browser/net/net_log_temp_file.h',
+        'browser/net/net_pref_observer.cc',
+        'browser/net/net_pref_observer.h',
+        'browser/net/network_stats.cc',
+        'browser/net/network_stats.h',
+        'browser/net/network_time_tracker.cc',
+        'browser/net/network_time_tracker.h',
+        'browser/net/preconnect.cc',
+        'browser/net/preconnect.h',
+        'browser/net/predictor.cc',
+        'browser/net/predictor.h',
+        'browser/net/predictor_tab_helper.cc',
+        'browser/net/predictor_tab_helper.h',
+        'browser/net/pref_proxy_config_tracker.cc',
+        'browser/net/pref_proxy_config_tracker.h',
+        'browser/net/pref_proxy_config_tracker_impl.cc',
+        'browser/net/pref_proxy_config_tracker_impl.h',
+        'browser/net/probe_message.cc',
+        'browser/net/probe_message.h',
+        'browser/net/proxy_service_factory.cc',
+        'browser/net/proxy_service_factory.h',
+        'browser/net/referrer.cc',
+        'browser/net/referrer.h',
+        'browser/net/resource_prefetch_predictor_observer.cc',
+        'browser/net/resource_prefetch_predictor_observer.h',
+        'browser/net/sdch_dictionary_fetcher.cc',
+        'browser/net/sdch_dictionary_fetcher.h',
+        'browser/net/service_providers_win.cc',
+        'browser/net/service_providers_win.h',
+        'browser/net/spdyproxy/http_auth_handler_spdyproxy.cc',
+        'browser/net/spdyproxy/http_auth_handler_spdyproxy.h',
+        'browser/net/sqlite_server_bound_cert_store.cc',
+        'browser/net/sqlite_server_bound_cert_store.h',
+        'browser/net/ssl_config_service_manager.h',
+        'browser/net/ssl_config_service_manager_pref.cc',
+        'browser/net/timed_cache.cc',
+        'browser/net/timed_cache.h',
+        'browser/net/transport_security_persister.cc',
+        'browser/net/transport_security_persister.h',
+        'browser/net/url_info.cc',
+        'browser/net/url_info.h',
+        'browser/notifications/balloon.cc',
+        'browser/notifications/balloon.h',
+        'browser/notifications/balloon_collection.cc',
+        'browser/notifications/balloon_collection.h',
+        'browser/notifications/balloon_collection_base.cc',
+        'browser/notifications/balloon_collection_base.h',
+        'browser/notifications/balloon_collection_impl.cc',
+        'browser/notifications/balloon_collection_impl.h',
+        'browser/notifications/balloon_host.cc',
+        'browser/notifications/balloon_host.h',
+        'browser/notifications/balloon_notification_ui_manager.cc',
+        'browser/notifications/balloon_notification_ui_manager.h',
+        'browser/notifications/desktop_notification_service.cc',
+        'browser/notifications/desktop_notification_service.h',
+        'browser/notifications/desktop_notification_service_factory.cc',
+        'browser/notifications/desktop_notification_service_factory.h',
+        'browser/notifications/desktop_notification_service_win.cc',
+        'browser/notifications/fake_balloon_view.cc',
+        'browser/notifications/fake_balloon_view.h',
+        'browser/notifications/message_center_notification_manager.cc',
+        'browser/notifications/message_center_notification_manager.h',
+        'browser/notifications/message_center_notification_manager_win.cc',
+        'browser/notifications/message_center_settings_controller.cc',
+        'browser/notifications/message_center_settings_controller.h',
+        'browser/notifications/notification.cc',
+        'browser/notifications/notification.h',
+        'browser/notifications/notification_delegate.cc',
+        'browser/notifications/notification_delegate.h',
+        'browser/notifications/notification_object_proxy.cc',
+        'browser/notifications/notification_object_proxy.h',
+        'browser/notifications/notification_options_menu_model.cc',
+        'browser/notifications/notification_options_menu_model.h',
+        'browser/notifications/notification_prefs_manager.cc',
+        'browser/notifications/notification_prefs_manager.h',
+        'browser/notifications/notification_ui_manager.cc',
+        'browser/notifications/notification_ui_manager.h',
+        'browser/notifications/notification_ui_manager_impl.cc',
+        'browser/notifications/notification_ui_manager_impl.h',
+        'browser/notifications/notification_ui_manager_mac.mm',
+        'browser/notifications/notification_ui_manager_mac.h',
+        'browser/notifications/sync_notifier/chrome_notifier_delegate.cc',
+        'browser/notifications/sync_notifier/chrome_notifier_delegate.h',
+        'browser/notifications/sync_notifier/chrome_notifier_service.cc',
+        'browser/notifications/sync_notifier/chrome_notifier_service.h',
+        'browser/notifications/sync_notifier/chrome_notifier_service_factory.cc',
+        'browser/notifications/sync_notifier/chrome_notifier_service_factory.h',
+        'browser/notifications/sync_notifier/notification_bitmap_fetcher.cc',
+        'browser/notifications/sync_notifier/notification_bitmap_fetcher.h',
+        'browser/notifications/sync_notifier/synced_notification.cc',
+        'browser/notifications/sync_notifier/synced_notification.h',
+        'browser/omnibox/omnibox_field_trial.cc',
+        'browser/omnibox/omnibox_field_trial.h',
+        'browser/omnibox/omnibox_log.cc',
+        'browser/omnibox/omnibox_log.h',
+        'browser/page_cycler/page_cycler.cc',
+        'browser/page_cycler/page_cycler.h',
+        'browser/parsers/metadata_parser.cc',
+        'browser/parsers/metadata_parser.h',
+        'browser/parsers/metadata_parser_factory.h',
+        'browser/parsers/metadata_parser_filebase.cc',
+        'browser/parsers/metadata_parser_filebase.h',
+        'browser/parsers/metadata_parser_jpeg.cc',
+        'browser/parsers/metadata_parser_jpeg.h',
+        'browser/parsers/metadata_parser_jpeg_factory.cc',
+        'browser/parsers/metadata_parser_jpeg_factory.h',
+        'browser/parsers/metadata_parser_manager.cc',
+        'browser/parsers/metadata_parser_manager.h',
+        'browser/password_manager/login_database.cc',
+        'browser/password_manager/login_database.h',
+        'browser/password_manager/login_database_mac.cc',
+        'browser/password_manager/login_database_posix.cc',
+        'browser/password_manager/login_database_win.cc',
+        'browser/password_manager/native_backend_gnome_x.cc',
+        'browser/password_manager/native_backend_gnome_x.h',
+        'browser/password_manager/native_backend_kwallet_x.cc',
+        'browser/password_manager/native_backend_kwallet_x.h',
+        'browser/password_manager/password_form_manager.cc',
+        'browser/password_manager/password_form_manager.h',
+        'browser/password_manager/password_generation_manager.cc',
+        'browser/password_manager/password_generation_manager.h',
+        'browser/password_manager/password_manager.cc',
+        'browser/password_manager/password_manager.h',
+        'browser/password_manager/password_manager_delegate.h',
+        'browser/password_manager/password_manager_delegate_impl.cc',
+        'browser/password_manager/password_manager_delegate_impl.h',
+        'browser/password_manager/password_store.cc',
+        'browser/password_manager/password_store.h',
+        'browser/password_manager/password_store_consumer.cc',
+        'browser/password_manager/password_store_consumer.h',
+        'browser/password_manager/password_store_default.cc',
+        'browser/password_manager/password_store_default.h',
+        'browser/password_manager/password_store_factory.cc',
+        'browser/password_manager/password_store_factory.h',
+        'browser/password_manager/password_store_mac.cc',
+        'browser/password_manager/password_store_mac.h',
+        'browser/password_manager/password_store_mac_internal.h',
+        'browser/password_manager/password_store_win.cc',
+        'browser/password_manager/password_store_win.h',
+        'browser/password_manager/password_store_x.cc',
+        'browser/password_manager/password_store_x.h',
+        'browser/pepper_broker_infobar_delegate.cc',
+        'browser/pepper_broker_infobar_delegate.h',
+        'browser/pepper_flash_settings_manager.cc',
+        'browser/pepper_flash_settings_manager.h',
+        'browser/performance_monitor/constants.cc',
+        'browser/performance_monitor/constants.h',
+        'browser/performance_monitor/database.cc',
+        'browser/performance_monitor/database.h',
+        'browser/performance_monitor/event.cc',
+        'browser/performance_monitor/event.h',
+        'browser/performance_monitor/key_builder.cc',
+        'browser/performance_monitor/key_builder.h',
+        'browser/performance_monitor/metric.cc',
+        'browser/performance_monitor/metric.h',
+        'browser/performance_monitor/performance_monitor.cc',
+        'browser/performance_monitor/performance_monitor.h',
+        'browser/performance_monitor/performance_monitor_util.cc',
+        'browser/performance_monitor/performance_monitor_util.h',
+        'browser/performance_monitor/startup_timer.cc',
+        'browser/performance_monitor/startup_timer.h',
+        'browser/platform_util.h',
+        'browser/platform_util_android.cc',
+        'browser/platform_util_aura.cc',
+        'browser/platform_util_chromeos.cc',
+        'browser/platform_util_common_linux.cc',
+        'browser/platform_util_linux.cc',
+        'browser/platform_util_mac.mm',
+        'browser/platform_util_win.cc',
+        'browser/plugins/chrome_plugin_service_filter.cc',
+        'browser/plugins/chrome_plugin_service_filter.h',
+        'browser/plugins/plugins_resource_service.cc',
+        'browser/plugins/plugins_resource_service.h',
+        'browser/plugins/plugin_data_remover_helper.cc',
+        'browser/plugins/plugin_data_remover_helper.h',
+        'browser/plugins/plugin_finder.cc',
+        'browser/plugins/plugin_finder.h',
+        'browser/plugins/plugin_infobar_delegates.cc',
+        'browser/plugins/plugin_infobar_delegates.h',
+        'browser/plugins/plugin_info_message_filter.cc',
+        'browser/plugins/plugin_info_message_filter.h',
+        'browser/plugins/plugin_installer.cc',
+        'browser/plugins/plugin_installer.h',
+        'browser/plugins/plugin_installer_observer.cc',
+        'browser/plugins/plugin_installer_observer.h',
+        'browser/plugins/plugin_metadata.cc',
+        'browser/plugins/plugin_metadata.h',
+        'browser/plugins/plugin_observer.cc',
+        'browser/plugins/plugin_observer.h',
+        'browser/plugins/plugin_prefs.cc',
+        'browser/plugins/plugin_prefs.h',
+        'browser/plugins/plugin_prefs_factory.cc',
+        'browser/plugins/plugin_prefs_factory.h',
+        'browser/plugins/plugin_status_pref_setter.cc',
+        'browser/plugins/plugin_status_pref_setter.h',
+        'browser/policy/async_policy_loader.cc',
+        'browser/policy/async_policy_loader.h',
+        'browser/policy/async_policy_provider.cc',
+        'browser/policy/async_policy_provider.h',
+        'browser/policy/browser_policy_connector.cc',
+        'browser/policy/browser_policy_connector.h',
+        'browser/policy/cloud/cloud_external_data_manager.cc',
+        'browser/policy/cloud/cloud_external_data_manager.h',
+        'browser/policy/cloud/cloud_external_data_manager_base.cc',
+        'browser/policy/cloud/cloud_external_data_manager_base.h',
+        'browser/policy/cloud/cloud_external_data_store.cc',
+        'browser/policy/cloud/cloud_external_data_store.h',
+        'browser/policy/cloud/cloud_policy_client.cc',
+        'browser/policy/cloud/cloud_policy_client.h',
+        'browser/policy/cloud/cloud_policy_client_registration_helper.cc',
+        'browser/policy/cloud/cloud_policy_client_registration_helper.h',
+        'browser/policy/cloud/cloud_policy_constants.cc',
+        'browser/policy/cloud/cloud_policy_constants.h',
+        'browser/policy/cloud/cloud_policy_core.cc',
+        'browser/policy/cloud/cloud_policy_core.h',
+        'browser/policy/cloud/cloud_policy_invalidator.cc',
+        'browser/policy/cloud/cloud_policy_invalidator.h',
+        'browser/policy/cloud/cloud_policy_manager.cc',
+        'browser/policy/cloud/cloud_policy_manager.h',
+        'browser/policy/cloud/cloud_policy_refresh_scheduler.cc',
+        'browser/policy/cloud/cloud_policy_refresh_scheduler.h',
+        'browser/policy/cloud/cloud_policy_service.cc',
+        'browser/policy/cloud/cloud_policy_service.h',
+        'browser/policy/cloud/cloud_policy_store.cc',
+        'browser/policy/cloud/cloud_policy_store.h',
+        'browser/policy/cloud/cloud_policy_validator.cc',
+        'browser/policy/cloud/cloud_policy_validator.h',
+        'browser/policy/cloud/component_cloud_policy_service.cc',
+        'browser/policy/cloud/component_cloud_policy_service.h',
+        'browser/policy/cloud/component_cloud_policy_store.cc',
+        'browser/policy/cloud/component_cloud_policy_store.h',
+        'browser/policy/cloud/component_cloud_policy_updater.cc',
+        'browser/policy/cloud/component_cloud_policy_updater.h',
+        'browser/policy/cloud/device_management_service.cc',
+        'browser/policy/cloud/device_management_service.h',
+        'browser/policy/cloud/enterprise_metrics.cc',
+        'browser/policy/cloud/enterprise_metrics.h',
+        'browser/policy/cloud/external_policy_data_updater.cc',
+        'browser/policy/cloud/external_policy_data_updater.h',
+        'browser/policy/cloud/message_util.cc',
+        'browser/policy/cloud/message_util.h',
+        'browser/policy/cloud/rate_limiter.cc',
+        'browser/policy/cloud/rate_limiter.h',
+        'browser/policy/cloud/resource_cache.cc',
+        'browser/policy/cloud/resource_cache.h',
+        'browser/policy/cloud/user_cloud_policy_invalidator_factory.cc',
+        'browser/policy/cloud/user_cloud_policy_invalidator_factory.h',
+        'browser/policy/cloud/user_cloud_policy_invalidator.cc',
+        'browser/policy/cloud/user_cloud_policy_invalidator.h',
+        'browser/policy/cloud/user_cloud_policy_manager.cc',
+        'browser/policy/cloud/user_cloud_policy_manager.h',
+        'browser/policy/cloud/user_cloud_policy_manager_factory.cc',
+        'browser/policy/cloud/user_cloud_policy_manager_factory.h',
+        'browser/policy/cloud/user_cloud_policy_store.cc',
+        'browser/policy/cloud/user_cloud_policy_store.h',
+        'browser/policy/cloud/user_cloud_policy_store_base.cc',
+        'browser/policy/cloud/user_cloud_policy_store_base.h',
+        'browser/policy/cloud/user_info_fetcher.cc',
+        'browser/policy/cloud/user_info_fetcher.h',
+        'browser/policy/cloud/user_policy_signin_service.cc',
+        'browser/policy/cloud/user_policy_signin_service.h',
+        'browser/policy/cloud/user_policy_signin_service_android.cc',
+        'browser/policy/cloud/user_policy_signin_service_android.h',
+        'browser/policy/cloud/user_policy_signin_service_base.cc',
+        'browser/policy/cloud/user_policy_signin_service_base.h',
+        'browser/policy/cloud/user_policy_signin_service_factory.cc',
+        'browser/policy/cloud/user_policy_signin_service_factory.h',
+        'browser/policy/config_dir_policy_loader.cc',
+        'browser/policy/config_dir_policy_loader.h',
+        'browser/policy/configuration_policy_handler.cc',
+        'browser/policy/configuration_policy_handler.h',
+        'browser/policy/configuration_policy_handler_android.cc',
+        'browser/policy/configuration_policy_handler_android.h',
+        'browser/policy/configuration_policy_handler_list.cc',
+        'browser/policy/configuration_policy_handler_list.h',
+        'browser/policy/configuration_policy_pref_store.cc',
+        'browser/policy/configuration_policy_pref_store.h',
+        'browser/policy/configuration_policy_provider.cc',
+        'browser/policy/configuration_policy_provider.h',
+        'browser/policy/external_data_fetcher.cc',
+        'browser/policy/external_data_fetcher.h',
+        'browser/policy/external_data_manager.h',
+        'browser/policy/managed_mode_policy_provider.cc',
+        'browser/policy/managed_mode_policy_provider.h',
+        'browser/policy/policy_bundle.cc',
+        'browser/policy/policy_bundle.h',
+        'browser/policy/policy_domain_descriptor.cc',
+        'browser/policy/policy_domain_descriptor.h',
+        'browser/policy/policy_error_map.cc',
+        'browser/policy/policy_error_map.h',
+        'browser/policy/policy_load_status.cc',
+        'browser/policy/policy_load_status.h',
+        'browser/policy/policy_loader_mac.cc',
+        'browser/policy/policy_loader_mac.h',
+        'browser/policy/policy_loader_win.cc',
+        'browser/policy/policy_loader_win.h',
+        'browser/policy/policy_map.cc',
+        'browser/policy/policy_map.h',
+        'browser/policy/policy_service.cc',
+        'browser/policy/policy_service.h',
+        'browser/policy/policy_service_impl.cc',
+        'browser/policy/policy_service_impl.h',
+        'browser/policy/policy_service_stub.cc',
+        'browser/policy/policy_service_stub.h',
+        'browser/policy/policy_statistics_collector.cc',
+        'browser/policy/policy_statistics_collector.h',
+        'browser/policy/policy_types.h',
+        'browser/policy/preferences_mac.cc',
+        'browser/policy/preferences_mac.h',
+        'browser/policy/preg_parser_win.cc',
+        'browser/policy/preg_parser_win.h',
+        'browser/policy/profile_policy_connector.cc',
+        'browser/policy/profile_policy_connector_stub.cc',
+        'browser/policy/profile_policy_connector.h',
+        'browser/policy/profile_policy_connector_factory.cc',
+        'browser/policy/profile_policy_connector_factory.h',
+        'browser/policy/registry_dict_win.cc',
+        'browser/policy/registry_dict_win.h',
+        'browser/policy/url_blacklist_manager.cc',
+        'browser/policy/url_blacklist_manager.h',
+        'browser/predictors/autocomplete_action_predictor.cc',
+        'browser/predictors/autocomplete_action_predictor.h',
+        'browser/predictors/autocomplete_action_predictor_factory.cc',
+        'browser/predictors/autocomplete_action_predictor_factory.h',
+        'browser/predictors/autocomplete_action_predictor_table.cc',
+        'browser/predictors/autocomplete_action_predictor_table.h',
+        'browser/predictors/logged_in_predictor_table.cc',
+        'browser/predictors/logged_in_predictor_table.h',
+        'browser/predictors/predictor_database.cc',
+        'browser/predictors/predictor_database.h',
+        'browser/predictors/predictor_database_factory.cc',
+        'browser/predictors/predictor_database_factory.h',
+        'browser/predictors/predictor_table_base.cc',
+        'browser/predictors/predictor_table_base.h',
+        'browser/predictors/resource_prefetch_common.cc',
+        'browser/predictors/resource_prefetch_common.h',
+        'browser/predictors/resource_prefetch_predictor.cc',
+        'browser/predictors/resource_prefetch_predictor.h',
+        'browser/predictors/resource_prefetch_predictor_factory.cc',
+        'browser/predictors/resource_prefetch_predictor_factory.h',
+        'browser/predictors/resource_prefetch_predictor_tables.cc',
+        'browser/predictors/resource_prefetch_predictor_tables.h',
+        'browser/predictors/resource_prefetcher.cc',
+        'browser/predictors/resource_prefetcher.h',
+        'browser/predictors/resource_prefetcher_manager.cc',
+        'browser/predictors/resource_prefetcher_manager.h',
+        'browser/pref_service_flags_storage.cc',
+        'browser/pref_service_flags_storage.h',
+        'browser/prefs/browser_prefs.cc',
+        'browser/prefs/browser_prefs.h',
+        'browser/prefs/chrome_pref_service_factory.cc',
+        'browser/prefs/chrome_pref_service_factory.h',
+        'browser/prefs/command_line_pref_store.cc',
+        'browser/prefs/command_line_pref_store.h',
+        'browser/prefs/incognito_mode_prefs.cc',
+        'browser/prefs/incognito_mode_prefs.h',
+        'browser/prefs/pref_model_associator.cc',
+        'browser/prefs/pref_model_associator.h',
+        'browser/prefs/pref_metrics_service.cc',
+        'browser/prefs/pref_metrics_service.h',
+        'browser/prefs/pref_service_syncable.cc',
+        'browser/prefs/pref_service_syncable.h',
+        'browser/prefs/pref_service_syncable_builder.cc',
+        'browser/prefs/pref_service_syncable_builder.h',
+        'browser/prefs/pref_service_syncable_observer.h',
+        'browser/prefs/proxy_config_dictionary.cc',
+        'browser/prefs/proxy_config_dictionary.h',
+        'browser/prefs/proxy_prefs.cc',
+        'browser/prefs/proxy_prefs.h',
+        'browser/prefs/scoped_user_pref_update.cc',
+        'browser/prefs/scoped_user_pref_update.h',
+        'browser/prefs/session_startup_pref.cc',
+        'browser/prefs/session_startup_pref.h',
+        'browser/prefs/synced_pref_change_registrar.cc',
+        'browser/prefs/synced_pref_change_registrar.h',
+        'browser/prefs/synced_pref_observer.h',
+        'browser/prerender/prerender_condition.h',
+        'browser/prerender/prerender_config.cc',
+        'browser/prerender/prerender_config.h',
+        'browser/prerender/prerender_contents.cc',
+        'browser/prerender/prerender_contents.h',
+        'browser/prerender/prerender_field_trial.cc',
+        'browser/prerender/prerender_field_trial.h',
+        'browser/prerender/prerender_final_status.cc',
+        'browser/prerender/prerender_final_status.h',
+        'browser/prerender/prerender_handle.cc',
+        'browser/prerender/prerender_handle.h',
+        'browser/prerender/prerender_histograms.cc',
+        'browser/prerender/prerender_histograms.h',
+        'browser/prerender/prerender_history.cc',
+        'browser/prerender/prerender_history.h',
+        'browser/prerender/prerender_link_manager.cc',
+        'browser/prerender/prerender_link_manager.h',
+        'browser/prerender/prerender_link_manager_factory.cc',
+        'browser/prerender/prerender_link_manager_factory.h',
+        'browser/prerender/prerender_local_predictor.cc',
+        'browser/prerender/prerender_local_predictor.h',
+        'browser/prerender/prerender_manager.cc',
+        'browser/prerender/prerender_manager.h',
+        'browser/prerender/prerender_manager_factory.cc',
+        'browser/prerender/prerender_manager_factory.h',
+        'browser/prerender/prerender_message_filter.cc',
+        'browser/prerender/prerender_message_filter.h',
+        'browser/prerender/prerender_origin.cc',
+        'browser/prerender/prerender_origin.h',
+        'browser/prerender/prerender_render_view_host_observer.cc',
+        'browser/prerender/prerender_render_view_host_observer.h',
+        'browser/prerender/prerender_tab_helper.cc',
+        'browser/prerender/prerender_tab_helper.h',
+        'browser/prerender/prerender_tracker.cc',
+        'browser/prerender/prerender_tracker.h',
+        'browser/prerender/prerender_util.cc',
+        'browser/prerender/prerender_util.h',
+        'browser/printing/background_printing_manager.cc',
+        'browser/printing/background_printing_manager.h',
+        'browser/printing/cloud_print/cloud_print_proxy_service.cc',
+        'browser/printing/cloud_print/cloud_print_proxy_service.h',
+        'browser/printing/cloud_print/cloud_print_proxy_service_factory.cc',
+        'browser/printing/cloud_print/cloud_print_proxy_service_factory.h',
+        'browser/printing/cloud_print/cloud_print_url.cc',
+        'browser/printing/cloud_print/cloud_print_url.h',
+        'browser/printing/print_dialog_cloud.cc',
+        'browser/printing/print_dialog_cloud.h',
+        'browser/printing/print_dialog_gtk.cc',
+        'browser/printing/print_dialog_gtk.h',
+        'browser/printing/print_error_dialog.cc',
+        'browser/printing/print_error_dialog.h',
+        'browser/printing/print_job.cc',
+        'browser/printing/print_job.h',
+        'browser/printing/print_job_manager.cc',
+        'browser/printing/print_job_manager.h',
+        'browser/printing/print_job_worker.cc',
+        'browser/printing/print_job_worker.h',
+        'browser/printing/print_job_worker_owner.h',
+        'browser/printing/print_preview_context_menu_observer.cc',
+        'browser/printing/print_preview_context_menu_observer.h',
+        'browser/printing/print_preview_data_service.cc',
+        'browser/printing/print_preview_data_service.h',
+        'browser/printing/print_preview_dialog_controller.cc',
+        'browser/printing/print_preview_dialog_controller.h',
+        'browser/printing/print_preview_message_handler.cc',
+        'browser/printing/print_preview_message_handler.h',
+        'browser/printing/print_system_task_proxy.cc',
+        'browser/printing/print_system_task_proxy.h',
+        'browser/printing/print_view_manager_base.cc',
+        'browser/printing/print_view_manager_base.h',
+        'browser/printing/print_view_manager_basic.cc',
+        'browser/printing/print_view_manager_basic.h',
+        'browser/printing/print_view_manager.cc',
+        'browser/printing/print_view_manager.h',
+        'browser/printing/print_view_manager_observer.h',
+        'browser/printing/printer_manager_dialog.h',
+        'browser/printing/printer_manager_dialog_linux.cc',
+        'browser/printing/printer_manager_dialog_mac.mm',
+        'browser/printing/printer_manager_dialog_win.cc',
+        'browser/printing/printer_query.cc',
+        'browser/printing/printer_query.h',
+        'browser/printing/printing_message_filter.cc',
+        'browser/printing/printing_message_filter.h',
+        'browser/process_info_snapshot.h',
+        'browser/process_info_snapshot_mac.cc',
+        'browser/process_singleton.h',
+        'browser/process_singleton_linux.cc',
+        'browser/process_singleton_mac.cc',
+        'browser/process_singleton_modal_dialog_lock.cc',
+        'browser/process_singleton_modal_dialog_lock.h',
+        'browser/process_singleton_startup_lock.cc',
+        'browser/process_singleton_startup_lock.h',
+        'browser/process_singleton_win.cc',
+        'browser/profile_resetter/brandcoded_default_settings.h',
+        'browser/profile_resetter/brandcoded_default_settings.cc',
+        'browser/profile_resetter/brandcode_config_fetcher.h',
+        'browser/profile_resetter/brandcode_config_fetcher.cc',
+        'browser/profile_resetter/profile_resetter.h',
+        'browser/profile_resetter/profile_resetter.cc',
+        'browser/profile_resetter/resettable_settings_snapshot.h',
+        'browser/profile_resetter/resettable_settings_snapshot.cc',
+        'browser/profiles/avatar_menu_model.cc',
+        'browser/profiles/avatar_menu_model.h',
+        'browser/profiles/avatar_menu_model_observer.h',
+        'browser/profiles/bookmark_model_loaded_observer.cc',
+        'browser/profiles/bookmark_model_loaded_observer.h',
+        'browser/profiles/chrome_browser_main_extra_parts_profiles.cc',
+        'browser/profiles/chrome_browser_main_extra_parts_profiles.h',
+        'browser/profiles/chrome_version_service.cc',
+        'browser/profiles/chrome_version_service.h',
+        'browser/profiles/gaia_info_update_service.cc',
+        'browser/profiles/gaia_info_update_service.h',
+        'browser/profiles/gaia_info_update_service_factory.cc',
+        'browser/profiles/gaia_info_update_service_factory.h',
+        'browser/profiles/incognito_helpers.cc',
+        'browser/profiles/incognito_helpers.h',
+        'browser/profiles/off_the_record_profile_impl.cc',
+        'browser/profiles/off_the_record_profile_impl.h',
+        'browser/profiles/off_the_record_profile_io_data.cc',
+        'browser/profiles/off_the_record_profile_io_data.h',
+        'browser/profiles/profile.cc',
+        'browser/profiles/profile.h',
+        'browser/profiles/profile_android.cc',
+        'browser/profiles/profile_android.h',
+        'browser/profiles/profile_destroyer.cc',
+        'browser/profiles/profile_destroyer.h',
+        'browser/profiles/profile_downloader.cc',
+        'browser/profiles/profile_downloader.h',
+        'browser/profiles/profile_downloader_delegate.h',
+        'browser/profiles/profile_impl.cc',
+        'browser/profiles/profile_impl.h',
+        'browser/profiles/profile_impl_io_data.cc',
+        'browser/profiles/profile_impl_io_data.h',
+        'browser/profiles/profile_info_cache.cc',
+        'browser/profiles/profile_info_cache.h',
+        'browser/profiles/profile_info_cache_observer.h',
+        'browser/profiles/profile_info_interface.h',
+        'browser/profiles/profile_info_util.cc',
+        'browser/profiles/profile_info_util.h',
+        'browser/profiles/profile_io_data.cc',
+        'browser/profiles/profile_io_data.h',
+        'browser/profiles/profile_loader.cc',
+        'browser/profiles/profile_loader.h',
+        'browser/profiles/profile_manager.cc',
+        'browser/profiles/profile_manager.h',
+        'browser/profiles/profile_metrics.cc',
+        'browser/profiles/profile_metrics.h',
+        'browser/profiles/profile_shortcut_manager.cc',
+        'browser/profiles/profile_shortcut_manager.h',
+        'browser/profiles/profile_shortcut_manager_stub.cc',
+        'browser/profiles/profile_shortcut_manager_win.cc',
+        'browser/profiles/profile_shortcut_manager_win.h',
+        'browser/profiles/profile_window.cc',
+        'browser/profiles/profile_window.h',
+        'browser/profiles/profiles_state.cc',
+        'browser/profiles/profiles_state.h',
+        'browser/profiles/startup_task_runner_service.cc',
+        'browser/profiles/startup_task_runner_service.h',
+        'browser/profiles/startup_task_runner_service_factory.cc',
+        'browser/profiles/startup_task_runner_service_factory.h',
+        'browser/profiles/storage_partition_descriptor.h',
+        'browser/remove_rows_table_model.h',
+        'browser/renderer_host/chrome_render_message_filter.cc',
+        'browser/renderer_host/chrome_render_message_filter.h',
+        'browser/renderer_host/chrome_render_view_host_observer.cc',
+        'browser/renderer_host/chrome_render_view_host_observer.h',
+        'browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h',
+        'browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm',
+        'browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc',
+        'browser/renderer_host/chrome_resource_dispatcher_host_delegate.h',
+        'browser/renderer_host/chrome_url_request_user_data.cc',
+        'browser/renderer_host/chrome_url_request_user_data.h',
+        'browser/renderer_host/offline_resource_throttle.cc',
+        'browser/renderer_host/offline_resource_throttle.h',
+        'browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',
+        'browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h',
+        'browser/renderer_host/pepper/device_id_fetcher.h',
+        'browser/renderer_host/pepper/device_id_fetcher.cc',
+        'browser/renderer_host/pepper/pepper_broker_message_filter.cc',
+        'browser/renderer_host/pepper/pepper_broker_message_filter.h',
+        'browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc',
+        'browser/renderer_host/pepper/pepper_crx_file_system_message_filter.h',
+        'browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc',
+        'browser/renderer_host/pepper/pepper_extensions_common_message_filter.h',
+        'browser/renderer_host/pepper/pepper_flash_browser_host.cc',
+        'browser/renderer_host/pepper/pepper_flash_browser_host.h',
+        'browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc',
+        'browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h',
+        'browser/renderer_host/pepper/pepper_flash_drm_host.cc',
+        'browser/renderer_host/pepper/pepper_flash_drm_host.h',
+        'browser/renderer_host/pepper/pepper_talk_host.cc',
+        'browser/renderer_host/pepper/pepper_talk_host.h',
+        'browser/renderer_host/safe_browsing_resource_throttle.cc',
+        'browser/renderer_host/safe_browsing_resource_throttle.h',
+        'browser/renderer_host/safe_browsing_resource_throttle_factory.cc',
+        'browser/renderer_host/safe_browsing_resource_throttle_factory.h',
+        'browser/renderer_host/web_cache_manager.cc',
+        'browser/renderer_host/web_cache_manager.h',
+        'browser/renderer_preferences_util.cc',
+        'browser/renderer_preferences_util.h',
+        'browser/repost_form_warning_controller.cc',
+        'browser/repost_form_warning_controller.h',
+        'browser/resources_util.cc',
+        'browser/resources_util.h',
+        'browser/rlz/rlz.cc',
+        'browser/rlz/rlz.h',
+        'browser/safe_browsing/browser_feature_extractor.cc',
+        'browser/safe_browsing/browser_feature_extractor.h',
+        'browser/safe_browsing/browser_features.cc',
+        'browser/safe_browsing/browser_features.h',
+        'browser/safe_browsing/chunk_range.cc',
+        'browser/safe_browsing/chunk_range.h',
+        'browser/safe_browsing/client_side_detection_host.cc',
+        'browser/safe_browsing/client_side_detection_host.h',
+        'browser/safe_browsing/client_side_detection_service.cc',
+        'browser/safe_browsing/client_side_detection_service.h',
+        'browser/safe_browsing/database_manager.cc',
+        'browser/safe_browsing/database_manager.h',
+        'browser/safe_browsing/download_feedback.cc',
+        'browser/safe_browsing/download_feedback.h',
+        'browser/safe_browsing/download_feedback_service.cc',
+        'browser/safe_browsing/download_feedback_service.h',
+        'browser/safe_browsing/download_protection_service.cc',
+        'browser/safe_browsing/download_protection_service.h',
+        'browser/safe_browsing/malware_details.cc',
+        'browser/safe_browsing/malware_details.h',
+        'browser/safe_browsing/malware_details_cache.cc',
+        'browser/safe_browsing/malware_details_cache.h',
+        'browser/safe_browsing/malware_details_history.cc',
+        'browser/safe_browsing/malware_details_history.h',
+        'browser/safe_browsing/ping_manager.cc',
+        'browser/safe_browsing/ping_manager.h',
+        'browser/safe_browsing/prefix_set.cc',
+        'browser/safe_browsing/prefix_set.h',
+        'browser/safe_browsing/protocol_manager.cc',
+        'browser/safe_browsing/protocol_manager.h',
+        'browser/safe_browsing/protocol_manager_helper.cc',
+        'browser/safe_browsing/protocol_manager_helper.h',
+        'browser/safe_browsing/protocol_parser.cc',
+        'browser/safe_browsing/protocol_parser.h',
+        'browser/safe_browsing/safe_browsing_blocking_page.cc',
+        'browser/safe_browsing/safe_browsing_blocking_page.h',
+        'browser/safe_browsing/safe_browsing_database.cc',
+        'browser/safe_browsing/safe_browsing_database.h',
+        'browser/safe_browsing/safe_browsing_service.cc',
+        'browser/safe_browsing/safe_browsing_service.h',
+        'browser/safe_browsing/safe_browsing_store.cc',
+        'browser/safe_browsing/safe_browsing_store.h',
+        'browser/safe_browsing/safe_browsing_store_file.cc',
+        'browser/safe_browsing/safe_browsing_store_file.h',
+        'browser/safe_browsing/safe_browsing_tab_observer.cc',
+        'browser/safe_browsing/safe_browsing_tab_observer.h',
+        'browser/safe_browsing/safe_browsing_util.cc',
+        'browser/safe_browsing/safe_browsing_util.h',
+        'browser/safe_browsing/sandboxed_zip_analyzer.cc',
+        'browser/safe_browsing/sandboxed_zip_analyzer.h',
+        'browser/safe_browsing/signature_util_posix.cc',
+        'browser/safe_browsing/signature_util_win.cc',
+        'browser/safe_browsing/signature_util.h',
+        'browser/safe_browsing/two_phase_uploader.cc',
+        'browser/safe_browsing/two_phase_uploader.h',
+        'browser/safe_browsing/ui_manager.cc',
+        'browser/safe_browsing/ui_manager.h',
+        'browser/safe_json_parser.cc',
+        'browser/safe_json_parser.h',
+        'browser/screensaver_window_finder_x11.cc',
+        'browser/screensaver_window_finder_x11.h',
+        'browser/search/iframe_source.cc',
+        'browser/search/iframe_source.h',
+        'browser/search/instant_io_context.cc',
+        'browser/search/instant_io_context.h',
+        'browser/search/instant_service.cc',
+        'browser/search/instant_service.h',
+        'browser/search/instant_service_factory.cc',
+        'browser/search/instant_service_factory.h',
+        'browser/search/instant_service_observer.h',
+        'browser/search/local_ntp_source.cc',
+        'browser/search/local_ntp_source.h',
+        'browser/search/most_visited_iframe_source.cc',
+        'browser/search/most_visited_iframe_source.h',
+        'browser/search/search.cc',
+        'browser/search/search.h',
+        'browser/search/search_terms_tracker.cc',
+        'browser/search/search_terms_tracker.h',
+        'browser/search_engines/search_engine_type.h',
+        'browser/search_engines/search_host_to_urls_map.cc',
+        'browser/search_engines/search_host_to_urls_map.h',
+        'browser/search_engines/search_provider_install_data.cc',
+        'browser/search_engines/search_provider_install_data.h',
+        'browser/search_engines/search_provider_install_state_message_filter.cc',
+        'browser/search_engines/search_provider_install_state_message_filter.h',
+        'browser/search_engines/search_terms_data.cc',
+        'browser/search_engines/search_terms_data.h',
+        'browser/search_engines/search_terms_data_android.cc',
+        'browser/search_engines/search_terms_data_android.h',
+        'browser/search_engines/template_url.cc',
+        'browser/search_engines/template_url.h',
+        'browser/search_engines/template_url_fetcher.cc',
+        'browser/search_engines/template_url_fetcher.h',
+        'browser/search_engines/template_url_fetcher_callbacks.h',
+        'browser/search_engines/template_url_fetcher_factory.cc',
+        'browser/search_engines/template_url_fetcher_factory.h',
+        'browser/search_engines/template_url_id.h',
+        'browser/search_engines/template_url_parser.cc',
+        'browser/search_engines/template_url_parser.h',
+        'browser/search_engines/template_url_prepopulate_data.cc',
+        'browser/search_engines/template_url_prepopulate_data.h',
+        'browser/search_engines/template_url_service.cc',
+        'browser/search_engines/template_url_service.h',
+        'browser/search_engines/template_url_service_android.cc',
+        'browser/search_engines/template_url_service_android.h',
+        'browser/search_engines/template_url_service_factory.cc',
+        'browser/search_engines/template_url_service_factory.h',
+        'browser/search_engines/template_url_service_observer.h',
+        'browser/search_engines/util.cc',
+        'browser/search_engines/util.h',
+        'browser/service/service_process_control.cc',
+        'browser/service/service_process_control_mac.mm',
+        'browser/service/service_process_control.h',
+        'browser/sessions/base_session_service.cc',
+        'browser/sessions/base_session_service.h',
+        'browser/sessions/persistent_tab_restore_service.cc',
+        'browser/sessions/persistent_tab_restore_service.h',
+        'browser/sessions/session_backend.cc',
+        'browser/sessions/session_backend.h',
+        'browser/sessions/session_command.cc',
+        'browser/sessions/session_command.h',
+        'browser/sessions/session_id.cc',
+        'browser/sessions/session_id.h',
+        'browser/sessions/session_restore.cc',
+        'browser/sessions/session_restore.h',
+        'browser/sessions/session_restore_android.cc',
+        'browser/sessions/session_service.cc',
+        'browser/sessions/session_service.h',
+        'browser/sessions/session_service_factory.cc',
+        'browser/sessions/session_service_factory.h',
+        'browser/sessions/session_tab_helper.cc',
+        'browser/sessions/session_tab_helper.h',
+        'browser/sessions/session_types.cc',
+        'browser/sessions/session_types.h',
+        'browser/sessions/tab_restore_service.cc',
+        'browser/sessions/tab_restore_service.h',
+        'browser/sessions/tab_restore_service_factory.cc',
+        'browser/sessions/tab_restore_service_factory.h',
+        'browser/sessions/tab_restore_service_helper.cc',
+        'browser/sessions/tab_restore_service_helper.h',
+        'browser/shell_integration.cc',
+        'browser/shell_integration.h',
+        'browser/shell_integration_android.cc',
+        'browser/shell_integration_linux.cc',
+        'browser/shell_integration_linux.h',
+        'browser/shell_integration_mac.mm',
+        'browser/shell_integration_win.cc',
+        'browser/signin/about_signin_internals.cc',
+        'browser/signin/about_signin_internals.h',
+        'browser/signin/about_signin_internals_factory.cc',
+        'browser/signin/about_signin_internals_factory.h',
+        'browser/signin/chrome_signin_manager_delegate.cc',
+        'browser/signin/chrome_signin_manager_delegate.h',
+        'browser/signin/oauth2_token_service.cc',
+        'browser/signin/oauth2_token_service.h',
+        'browser/signin/profile_oauth2_token_service.cc',
+        'browser/signin/profile_oauth2_token_service.h',
+        'browser/signin/profile_oauth2_token_service_factory.cc',
+        'browser/signin/profile_oauth2_token_service_factory.h',
+        'browser/signin/profile_oauth2_token_service_request.cc',
+        'browser/signin/profile_oauth2_token_service_request.h',
+        'browser/signin/signin_global_error.cc',
+        'browser/signin/signin_global_error.h',
+        'browser/signin/signin_internals_util.cc',
+        'browser/signin/signin_internals_util.h',
+        'browser/signin/signin_manager.cc',
+        'browser/signin/signin_manager.h',
+        'browser/signin/signin_manager_base.cc',
+        'browser/signin/signin_manager_base.h',
+        'browser/signin/signin_manager_cookie_helper.cc',
+        'browser/signin/signin_manager_cookie_helper.h',
+        'browser/signin/signin_manager_delegate.h',
+        'browser/signin/signin_manager_factory.cc',
+        'browser/signin/signin_manager_factory.h',
+        'browser/signin/signin_names_io_thread.cc',
+        'browser/signin/signin_names_io_thread.h',
+        'browser/signin/signin_tracker.cc',
+        'browser/signin/signin_tracker.h',
+        'browser/signin/signin_promo.cc',
+        'browser/signin/signin_promo.h',
+        'browser/signin/signin_ui_util.cc',
+        'browser/signin/signin_ui_util.h',
+        'browser/signin/token_service.cc',
+        'browser/signin/token_service.h',
+        'browser/signin/token_service_factory.cc',
+        'browser/signin/token_service_factory.h',
+        'browser/signin/ubertoken_fetcher.cc',
+        'browser/signin/ubertoken_fetcher.h',
+        'browser/site_details.cc',
+        'browser/site_details.h',
+        'browser/speech/chrome_speech_recognition_manager_delegate.cc',
+        'browser/speech/chrome_speech_recognition_manager_delegate.h',
+        'browser/speech/chrome_speech_recognition_manager_delegate_bubble_ui.cc',
+        'browser/speech/chrome_speech_recognition_manager_delegate_bubble_ui.h',
+        'browser/speech/extension_api/tts_extension_api_constants.cc',
+        'browser/speech/extension_api/tts_extension_api_constants.h',
+        'browser/speech/speech_recognition_bubble.cc',
+        'browser/speech/speech_recognition_bubble.h',
+        'browser/speech/speech_recognition_bubble_controller.cc',
+        'browser/speech/speech_recognition_bubble_controller.h',
+        'browser/speech/tts_android.cc',
+        'browser/speech/tts_android.h',
+        'browser/speech/tts_chromeos.cc',
+        'browser/speech/tts_controller.cc',
+        'browser/speech/tts_controller.h',
+        'browser/speech/tts_extension_loader_chromeos.cc',
+        'browser/speech/tts_extension_loader_chromeos.h',
+        'browser/speech/tts_linux.cc',
+        'browser/speech/tts_mac.mm',
+        'browser/speech/tts_platform.cc',
+        'browser/speech/tts_platform.h',
+        'browser/speech/tts_message_filter.cc',
+        'browser/speech/tts_message_filter.h',
+        'browser/speech/tts_win.cc',
+        'browser/spellchecker/feedback.cc',
+        'browser/spellchecker/feedback.h',
+        'browser/spellchecker/feedback_sender.cc',
+        'browser/spellchecker/feedback_sender.h',
+        'browser/spellchecker/misspelling.cc',
+        'browser/spellchecker/misspelling.h',
+        'browser/spellchecker/spellcheck_action.cc',
+        'browser/spellchecker/spellcheck_action.h',
+        'browser/spellchecker/spellcheck_custom_dictionary.cc',
+        'browser/spellchecker/spellcheck_custom_dictionary.h',
+        'browser/spellchecker/spellcheck_dictionary.h',
+        'browser/spellchecker/spellcheck_factory.cc',
+        'browser/spellchecker/spellcheck_factory.h',
+        'browser/spellchecker/spellcheck_host_metrics.cc',
+        'browser/spellchecker/spellcheck_host_metrics.h',
+        'browser/spellchecker/spellcheck_hunspell_dictionary.cc',
+        'browser/spellchecker/spellcheck_hunspell_dictionary.h',
+        'browser/spellchecker/spellcheck_message_filter.cc',
+        'browser/spellchecker/spellcheck_message_filter.h',
+        'browser/spellchecker/spellcheck_message_filter_mac.cc',
+        'browser/spellchecker/spellcheck_message_filter_mac.h',
+        'browser/spellchecker/spellcheck_platform_mac.h',
+        'browser/spellchecker/spellcheck_platform_mac.mm',
+        'browser/spellchecker/spellcheck_service.cc',
+        'browser/spellchecker/spellcheck_service.h',
+        'browser/spellchecker/spelling_service_client.cc',
+        'browser/spellchecker/spelling_service_client.h',
+        'browser/spellchecker/word_trimmer.cc',
+        'browser/spellchecker/word_trimmer.h',
+        'browser/ssl/ssl_add_certificate.cc',
+        'browser/ssl/ssl_add_certificate.h',
+        'browser/ssl/ssl_add_cert_handler.cc',
+        'browser/ssl/ssl_add_cert_handler.h',
+        'browser/ssl/ssl_add_cert_handler_mac.mm',
+        'browser/ssl/ssl_blocking_page.cc',
+        'browser/ssl/ssl_blocking_page.h',
+        'browser/ssl/ssl_client_auth_observer.cc',
+        'browser/ssl/ssl_client_auth_observer.h',
+        'browser/ssl/ssl_client_certificate_selector.h',
+        'browser/ssl/ssl_error_info.cc',
+        'browser/ssl/ssl_error_info.h',
+        'browser/ssl/ssl_tab_helper.cc',
+        'browser/ssl/ssl_tab_helper.h',
+        'browser/status_icons/desktop_notification_balloon.cc',
+        'browser/status_icons/desktop_notification_balloon.h',
+        'browser/status_icons/status_icon.cc',
+        'browser/status_icons/status_icon.h',
+        'browser/status_icons/status_icon_observer.h',
+        'browser/status_icons/status_tray.cc',
+        'browser/status_icons/status_tray.h',
+        'browser/storage_monitor/image_capture_device.h',
+        'browser/storage_monitor/image_capture_device.mm',
+        'browser/storage_monitor/image_capture_device_manager.h',
+        'browser/storage_monitor/image_capture_device_manager.mm',
+        'browser/storage_monitor/media_storage_util.cc',
+        'browser/storage_monitor/media_storage_util.h',
+        'browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc',
+        'browser/storage_monitor/media_transfer_protocol_device_observer_linux.h',
+        'browser/storage_monitor/mtab_watcher_linux.cc',
+        'browser/storage_monitor/mtab_watcher_linux.h',
+        'browser/storage_monitor/portable_device_watcher_win.cc',
+        'browser/storage_monitor/portable_device_watcher_win.h',
+        'browser/storage_monitor/removable_device_constants.cc',
+        'browser/storage_monitor/removable_device_constants.h',
+        'browser/storage_monitor/removable_storage_observer.h',
+        'browser/storage_monitor/storage_info.cc',
+        'browser/storage_monitor/storage_info.h',
+        'browser/storage_monitor/storage_monitor_chromeos.cc',
+        'browser/storage_monitor/storage_monitor_chromeos.h',
+        'browser/storage_monitor/storage_monitor_linux.cc',
+        'browser/storage_monitor/storage_monitor_linux.h',
+        'browser/storage_monitor/storage_monitor_mac.h',
+        'browser/storage_monitor/storage_monitor_mac.mm',
+        'browser/storage_monitor/storage_monitor_win.cc',
+        'browser/storage_monitor/storage_monitor_win.h',
+        'browser/storage_monitor/storage_monitor.cc',
+        'browser/storage_monitor/storage_monitor.h',
+        'browser/storage_monitor/transient_device_ids.cc',
+        'browser/storage_monitor/transient_device_ids.h',
+        'browser/storage_monitor/udev_util_linux.cc',
+        'browser/storage_monitor/udev_util_linux.h',
+        'browser/storage_monitor/volume_mount_watcher_win.cc',
+        'browser/storage_monitor/volume_mount_watcher_win.h',
+        'browser/sxs_linux.cc',
+        'browser/sxs_linux.h',
+        'browser/sync/about_sync_util.cc',
+        'browser/sync/about_sync_util.h',
+        'browser/sync/backend_migrator.cc',
+        'browser/sync/backend_migrator.h',
+        'browser/sync/backend_unrecoverable_error_handler.cc',
+        'browser/sync/backend_unrecoverable_error_handler.h',
+        'browser/sync/glue/autofill_data_type_controller.cc',
+        'browser/sync/glue/autofill_data_type_controller.h',
+        'browser/sync/glue/autofill_profile_data_type_controller.cc',
+        'browser/sync/glue/autofill_profile_data_type_controller.h',
+        'browser/sync/glue/backend_data_type_configurer.cc',
+        'browser/sync/glue/backend_data_type_configurer.h',
+        'browser/sync/glue/bookmark_change_processor.cc',
+        'browser/sync/glue/bookmark_change_processor.h',
+        'browser/sync/glue/bookmark_data_type_controller.cc',
+        'browser/sync/glue/bookmark_data_type_controller.h',
+        'browser/sync/glue/bookmark_model_associator.cc',
+        'browser/sync/glue/bookmark_model_associator.h',
+        'browser/sync/glue/browser_thread_model_worker.cc',
+        'browser/sync/glue/browser_thread_model_worker.h',
+        'browser/sync/glue/change_processor.cc',
+        'browser/sync/glue/change_processor.h',
+        'browser/sync/glue/chrome_encryptor.cc',
+        'browser/sync/glue/chrome_encryptor.h',
+        'browser/sync/glue/chrome_report_unrecoverable_error.cc',
+        'browser/sync/glue/chrome_report_unrecoverable_error.h',
+        'browser/sync/glue/data_type_controller.cc',
+        'browser/sync/glue/data_type_controller.h',
+        'browser/sync/glue/data_type_encryption_handler.cc',
+        'browser/sync/glue/data_type_encryption_handler.h',
+        'browser/sync/glue/data_type_error_handler.h',
+        'browser/sync/glue/data_type_manager.cc',
+        'browser/sync/glue/data_type_manager.h',
+        'browser/sync/glue/data_type_manager_impl.cc',
+        'browser/sync/glue/data_type_manager_impl.h',
+        'browser/sync/glue/data_type_manager_observer.h',
+        'browser/sync/glue/device_info.cc',
+        'browser/sync/glue/device_info.h',
+        'browser/sync/glue/extension_data_type_controller.cc',
+        'browser/sync/glue/extension_data_type_controller.h',
+        'browser/sync/glue/extension_setting_data_type_controller.cc',
+        'browser/sync/glue/extension_setting_data_type_controller.h',
+        'browser/sync/glue/extensions_activity_monitor.cc',
+        'browser/sync/glue/extensions_activity_monitor.h',
+        'browser/sync/glue/failed_data_types_handler.cc',
+        'browser/sync/glue/failed_data_types_handler.h',
+        'browser/sync/glue/favicon_cache.cc',
+        'browser/sync/glue/favicon_cache.h',
+        'browser/sync/glue/frontend_data_type_controller.cc',
+        'browser/sync/glue/frontend_data_type_controller.h',
+        'browser/sync/glue/generic_change_processor.cc',
+        'browser/sync/glue/generic_change_processor.h',
+        'browser/sync/glue/history_model_worker.cc',
+        'browser/sync/glue/history_model_worker.h',
+        'browser/sync/glue/model_association_manager.cc',
+        'browser/sync/glue/model_association_manager.h',
+        'browser/sync/glue/model_associator.h',
+        'browser/sync/glue/non_frontend_data_type_controller.cc',
+        'browser/sync/glue/non_frontend_data_type_controller.h',
+        'browser/sync/glue/non_ui_data_type_controller.cc',
+        'browser/sync/glue/non_ui_data_type_controller.h',
+        'browser/sync/glue/password_change_processor.cc',
+        'browser/sync/glue/password_change_processor.h',
+        'browser/sync/glue/password_data_type_controller.cc',
+        'browser/sync/glue/password_data_type_controller.h',
+        'browser/sync/glue/password_model_associator.cc',
+        'browser/sync/glue/password_model_associator.h',
+        'browser/sync/glue/password_model_worker.cc',
+        'browser/sync/glue/password_model_worker.h',
+        'browser/sync/glue/proxy_data_type_controller.cc',
+        'browser/sync/glue/proxy_data_type_controller.h',
+        'browser/sync/glue/search_engine_data_type_controller.cc',
+        'browser/sync/glue/search_engine_data_type_controller.h',
+        'browser/sync/glue/session_change_processor.cc',
+        'browser/sync/glue/session_change_processor.h',
+        'browser/sync/glue/session_data_type_controller.cc',
+        'browser/sync/glue/session_data_type_controller.h',
+        'browser/sync/glue/session_model_associator.cc',
+        'browser/sync/glue/session_model_associator.h',
+        'browser/sync/glue/shared_change_processor.cc',
+        'browser/sync/glue/shared_change_processor.h',
+        'browser/sync/glue/shared_change_processor_ref.cc',
+        'browser/sync/glue/shared_change_processor_ref.h',
+        'browser/sync/glue/sync_backend_host.cc',
+        'browser/sync/glue/sync_backend_host.h',
+        'browser/sync/glue/sync_backend_registrar.cc',
+        'browser/sync/glue/sync_backend_registrar.h',
+        'browser/sync/glue/sync_start_util.cc',
+        'browser/sync/glue/sync_start_util.h',
+        'browser/sync/glue/synced_device_tracker.cc',
+        'browser/sync/glue/synced_device_tracker.h',
+        'browser/sync/glue/synced_session.cc',
+        'browser/sync/glue/synced_session.h',
+        'browser/sync/glue/synced_session_tracker.cc',
+        'browser/sync/glue/synced_session_tracker.h',
+        'browser/sync/glue/synced_tab_delegate.cc',
+        'browser/sync/glue/synced_tab_delegate_android.cc',
+        'browser/sync/glue/synced_tab_delegate_android.h',
+        'browser/sync/glue/synced_window_delegate.h',
+        'browser/sync/glue/synced_window_delegate_android.cc',
+        'browser/sync/glue/synced_window_delegate_android.h',
+        'browser/sync/glue/tab_node_pool.cc',
+        'browser/sync/glue/tab_node_pool.h',
+        'browser/sync/glue/theme_data_type_controller.cc',
+        'browser/sync/glue/theme_data_type_controller.h',
+        'browser/sync/glue/typed_url_change_processor.cc',
+        'browser/sync/glue/typed_url_change_processor.h',
+        'browser/sync/glue/typed_url_data_type_controller.cc',
+        'browser/sync/glue/typed_url_data_type_controller.h',
+        'browser/sync/glue/typed_url_model_associator.cc',
+        'browser/sync/glue/typed_url_model_associator.h',
+        'browser/sync/glue/ui_data_type_controller.cc',
+        'browser/sync/glue/ui_data_type_controller.h',
+        'browser/sync/glue/ui_model_worker.cc',
+        'browser/sync/glue/ui_model_worker.h',
+        'browser/sync/profile_sync_components_factory.h',
+        'browser/sync/profile_sync_components_factory_impl.cc',
+        'browser/sync/profile_sync_components_factory_impl.h',
+        'browser/sync/profile_sync_service.cc',
+        'browser/sync/profile_sync_service.h',
+        'browser/sync/profile_sync_service_android.cc',
+        'browser/sync/profile_sync_service_android.h',
+        'browser/sync/profile_sync_service_base.h',
+        'browser/sync/profile_sync_service_base.cc',
+        'browser/sync/profile_sync_service_factory.cc',
+        'browser/sync/profile_sync_service_factory.h',
+        'browser/sync/profile_sync_service_harness.cc',
+        'browser/sync/profile_sync_service_harness.h',
+        'browser/sync/profile_sync_service_model_type_selection_android.h',
+        'browser/sync/profile_sync_service_observer.cc',
+        'browser/sync/profile_sync_service_observer.h',
+        'browser/sync/retry_verifier.cc',
+        'browser/sync/retry_verifier.h',
+        'browser/sync/sync_startup_tracker.cc',
+        'browser/sync/sync_startup_tracker.h',
+        'browser/sync/sync_global_error.cc',
+        'browser/sync/sync_global_error.h',
+        'browser/sync/sync_prefs.cc',
+        'browser/sync/sync_prefs.h',
+        'browser/sync/sync_ui_util.cc',
+        'browser/sync/sync_ui_util.h',
+        'browser/sync/user_selectable_sync_type.h',
+        'browser/sync_file_system/conflict_resolution_policy.h',
+        'browser/sync_file_system/conflict_resolution_resolver.cc',
+        'browser/sync_file_system/conflict_resolution_resolver.h',
+        'browser/sync_file_system/drive_backend/api_util.cc',
+        'browser/sync_file_system/drive_backend/api_util.h',
+        'browser/sync_file_system/drive_backend/api_util_interface.h',
+        'browser/sync_file_system/drive_backend/drive_file_sync_service.cc',
+        'browser/sync_file_system/drive_backend/drive_file_sync_service.h',
+        'browser/sync_file_system/drive_backend/drive_file_sync_util.cc',
+        'browser/sync_file_system/drive_backend/drive_file_sync_util.h',
+        'browser/sync_file_system/drive_backend/drive_metadata_store.cc',
+        'browser/sync_file_system/drive_backend/drive_metadata_store.h',
+        'browser/sync_file_system/drive_backend/local_sync_delegate.cc',
+        'browser/sync_file_system/drive_backend/local_sync_delegate.h',
+        'browser/sync_file_system/drive_backend/local_sync_operation_resolver.cc',
+        'browser/sync_file_system/drive_backend/local_sync_operation_resolver.h',
+        'browser/sync_file_system/drive_backend/metadata_database.cc',
+        'browser/sync_file_system/drive_backend/metadata_database.h',
+        'browser/sync_file_system/drive_backend/metadata_db_migration_util.cc',
+        'browser/sync_file_system/drive_backend/metadata_db_migration_util.h',
+        'browser/sync_file_system/drive_backend/remote_change_handler.cc',
+        'browser/sync_file_system/drive_backend/remote_change_handler.h',
+        'browser/sync_file_system/drive_backend/remote_sync_delegate.cc',
+        'browser/sync_file_system/drive_backend/remote_sync_delegate.h',
+        'browser/sync_file_system/drive_backend/remote_sync_operation_resolver.cc',
+        'browser/sync_file_system/drive_backend/remote_sync_operation_resolver.h',
+        'browser/sync_file_system/drive_backend/tracker_set.cc',
+        'browser/sync_file_system/drive_backend/tracker_set.h',
+        'browser/sync_file_system/file_change.cc',
+        'browser/sync_file_system/file_change.h',
+        'browser/sync_file_system/file_status_observer.h',
+        'browser/sync_file_system/local_change_processor.h',
+        'browser/sync_file_system/local/local_file_change_tracker.cc',
+        'browser/sync_file_system/local/local_file_change_tracker.h',
+        'browser/sync_file_system/local/local_file_sync_context.cc',
+        'browser/sync_file_system/local/local_file_sync_context.h',
+        'browser/sync_file_system/local/local_file_sync_service.cc',
+        'browser/sync_file_system/local/local_file_sync_service.h',
+        'browser/sync_file_system/local/local_file_sync_status.cc',
+        'browser/sync_file_system/local/local_file_sync_status.h',
+        'browser/sync_file_system/local/local_origin_change_observer.h',
+        'browser/sync_file_system/local/sync_file_system_backend.cc',
+        'browser/sync_file_system/local/sync_file_system_backend.h',
+        'browser/sync_file_system/local/syncable_file_operation_runner.cc',
+        'browser/sync_file_system/local/syncable_file_operation_runner.h',
+        'browser/sync_file_system/local/syncable_file_system_operation.cc',
+        'browser/sync_file_system/local/syncable_file_system_operation.h',
+        'browser/sync_file_system/logger.cc',
+        'browser/sync_file_system/logger.h',
+        'browser/sync_file_system/remote_change_processor.h',
+        'browser/sync_file_system/remote_file_sync_service.h',
+        'browser/sync_file_system/sync_action.h',
+        'browser/sync_file_system/sync_callbacks.h',
+        'browser/sync_file_system/sync_direction.h',
+        'browser/sync_file_system/sync_event_observer.h',
+        'browser/sync_file_system/sync_file_metadata.cc',
+        'browser/sync_file_system/sync_file_metadata.h',
+        'browser/sync_file_system/sync_file_status.h',
+        'browser/sync_file_system/sync_file_system_service.cc',
+        'browser/sync_file_system/sync_file_system_service.h',
+        'browser/sync_file_system/sync_file_system_service_factory.cc',
+        'browser/sync_file_system/sync_file_system_service_factory.h',
+        'browser/sync_file_system/sync_file_type.h',
+        'browser/sync_file_system/sync_operation_type.cc',
+        'browser/sync_file_system/sync_operation_type.h',
+        'browser/sync_file_system/sync_service_state.h',
+        'browser/sync_file_system/sync_status_code.cc',
+        'browser/sync_file_system/sync_status_code.h',
+        'browser/sync_file_system/sync_task_manager.cc',
+        'browser/sync_file_system/sync_task_manager.h',
+        'browser/sync_file_system/syncable_file_system_util.cc',
+        'browser/sync_file_system/syncable_file_system_util.h',
+        'browser/tab_contents/background_contents.cc',
+        'browser/tab_contents/background_contents.h',
+        'browser/tab_contents/language_state.cc',
+        'browser/tab_contents/language_state.h',
+        'browser/tab_contents/navigation_metrics_recorder.cc',
+        'browser/tab_contents/navigation_metrics_recorder.h',
+        'browser/tab_contents/render_view_context_menu.cc',
+        'browser/tab_contents/render_view_context_menu.h',
+        'browser/tab_contents/render_view_context_menu_observer.cc',
+        'browser/tab_contents/render_view_context_menu_observer.h',
+        'browser/tab_contents/retargeting_details.h',
+        'browser/tab_contents/tab_util.cc',
+        'browser/tab_contents/tab_util.h',
+        'browser/tab_contents/spellchecker_submenu_observer.h',
+        'browser/tab_contents/spellchecker_submenu_observer_hunspell.cc',
+        'browser/tab_contents/spellchecker_submenu_observer_mac.cc',
+        'browser/tab_contents/spelling_bubble_model.cc',
+        'browser/tab_contents/spelling_bubble_model.h',
+        'browser/tab_contents/spelling_menu_observer.cc',
+        'browser/tab_contents/spelling_menu_observer.h',
+        'browser/task_manager/background_resource_provider.cc',
+        'browser/task_manager/background_resource_provider.h',
+        'browser/task_manager/browser_process_resource_provider.cc',
+        'browser/task_manager/browser_process_resource_provider.h',
+        'browser/task_manager/child_process_resource_provider.cc',
+        'browser/task_manager/child_process_resource_provider.h',
+        'browser/task_manager/extension_process_resource_provider.cc',
+        'browser/task_manager/extension_process_resource_provider.h',
+        'browser/task_manager/guest_resource_provider.cc',
+        'browser/task_manager/guest_resource_provider.h',
+        'browser/task_manager/notification_resource_provider.cc',
+        'browser/task_manager/notification_resource_provider.h',
+        'browser/task_manager/panel_resource_provider.cc',
+        'browser/task_manager/panel_resource_provider.h',
+        'browser/task_manager/renderer_resource.cc',
+        'browser/task_manager/renderer_resource.h',
+        'browser/task_manager/resource_provider.cc',
+        'browser/task_manager/resource_provider.h',
+        'browser/task_manager/tab_contents_resource_provider.cc',
+        'browser/task_manager/tab_contents_resource_provider.h',
+        'browser/task_manager/task_manager.cc',
+        'browser/task_manager/task_manager.h',
+        'browser/task_manager/task_manager_util.cc',
+        'browser/task_manager/task_manager_util.h',
+        'browser/task_manager/worker_resource_provider.cc',
+        'browser/task_manager/worker_resource_provider.h',
+        'browser/task_profiler/auto_tracking.cc',
+        'browser/task_profiler/auto_tracking.h',
+        'browser/task_profiler/task_profiler_data_serializer.cc',
+        'browser/task_profiler/task_profiler_data_serializer.h',
+        'browser/themes/browser_theme_pack.cc',
+        'browser/themes/browser_theme_pack.h',
+        'browser/themes/custom_theme_supplier.cc',
+        'browser/themes/custom_theme_supplier.h',
+        'browser/themes/theme_properties.cc',
+        'browser/themes/theme_properties.h',
+        'browser/themes/theme_service.cc',
+        'browser/themes/theme_service_factory.cc',
+        'browser/themes/theme_service_factory.h',
+        'browser/themes/theme_service.h',
+        'browser/themes/theme_service_aurax11.cc',
+        'browser/themes/theme_service_aurax11.h',
+        'browser/themes/theme_service_gtk.cc',
+        'browser/themes/theme_service_mac.mm',
+        'browser/themes/theme_syncable_service.cc',
+        'browser/themes/theme_syncable_service.h',
+        'browser/three_d_api_observer.cc',
+        'browser/three_d_api_observer.h',
+        'browser/thumbnails/content_analysis.cc',
+        'browser/thumbnails/content_analysis.h',
+        'browser/thumbnails/content_based_thumbnailing_algorithm.cc',
+        'browser/thumbnails/content_based_thumbnailing_algorithm.h',
+        'browser/thumbnails/simple_thumbnail_crop.cc',
+        'browser/thumbnails/simple_thumbnail_crop.h',
+        'browser/thumbnails/render_widget_snapshot_taker.cc',
+        'browser/thumbnails/render_widget_snapshot_taker.h',
+        'browser/thumbnails/thumbnail_service.h',
+        'browser/thumbnails/thumbnail_service_factory.cc',
+        'browser/thumbnails/thumbnail_service_factory.h',
+        'browser/thumbnails/thumbnail_service_impl.cc',
+        'browser/thumbnails/thumbnail_service_impl.h',
+        'browser/thumbnails/thumbnail_tab_helper.cc',
+        'browser/thumbnails/thumbnail_tab_helper.h',
+        'browser/thumbnails/thumbnailing_algorithm.h',
+        'browser/thumbnails/thumbnailing_context.cc',
+        'browser/thumbnails/thumbnailing_context.h',
+        'browser/translate/options_menu_model.cc',
+        'browser/translate/options_menu_model.h',
+        'browser/translate/page_translated_details.h',
+        'browser/translate/translate_accept_languages.h',
+        'browser/translate/translate_accept_languages.cc',
+        'browser/translate/translate_browser_metrics.cc',
+        'browser/translate/translate_browser_metrics.h',
+        'browser/translate/translate_error_details.h',
+        'browser/translate/translate_event_details.cc',
+        'browser/translate/translate_event_details.h',
+        'browser/translate/translate_infobar_delegate.cc',
+        'browser/translate/translate_infobar_delegate.h',
+        'browser/translate/translate_language_list.cc',
+        'browser/translate/translate_language_list.h',
+        'browser/translate/translate_manager.cc',
+        'browser/translate/translate_manager.h',
+        'browser/translate/translate_prefs.cc',
+        'browser/translate/translate_prefs.h',
+        'browser/translate/translate_script.cc',
+        'browser/translate/translate_script.h',
+        'browser/translate/translate_tab_helper.cc',
+        'browser/translate/translate_tab_helper.h',
+        'browser/translate/translate_url_fetcher.cc',
+        'browser/translate/translate_url_fetcher.h',
+        'browser/translate/translate_url_util.cc',
+        'browser/translate/translate_url_util.h',
+        'browser/undo/undo_manager.cc',
+        'browser/undo/undo_manager.h',
+        'browser/undo/undo_manager_utils.cc',
+        'browser/undo/undo_manager_utils.h',
+        'browser/undo/undo_operation.h',
+        'browser/upgrade_detector.cc',
+        'browser/upgrade_detector.h',
+        'browser/upgrade_detector_impl.cc',
+        'browser/upgrade_detector_impl.h',
+        'browser/upload_list.cc',
+        'browser/upload_list.h',
+        'browser/usb/usb_device.cc',
+        'browser/usb/usb_device.h',
+        'browser/usb/usb_device_handle.cc',
+        'browser/usb/usb_device_handle.h',
+        'browser/usb/usb_interface.cc',
+        'browser/usb/usb_interface.h',
+        'browser/usb/usb_context.cc',
+        'browser/usb/usb_context.h',
+        'browser/usb/usb_service.cc',
+        'browser/usb/usb_service.h',
+        'browser/user_data_dir_extractor.cc',
+        'browser/user_data_dir_extractor.h',
+        'browser/user_data_dir_extractor_win.cc',
+        'browser/user_data_dir_extractor_win.h',
+        'browser/user_style_sheet_watcher.cc',
+        'browser/user_style_sheet_watcher.h',
+        'browser/user_style_sheet_watcher_factory.cc',
+        'browser/user_style_sheet_watcher_factory.h',
+        'browser/validation_message_message_filter.cc',
+        'browser/validation_message_message_filter.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_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.cc',
+        'browser/value_store/value_store.h',
+        'browser/web_applications/web_app.cc',
+        'browser/web_applications/web_app.h',
+        'browser/web_applications/web_app_android.cc',
+        'browser/web_applications/web_app_linux.cc',
+        'browser/web_applications/web_app_mac.h',
+        'browser/web_applications/web_app_mac.mm',
+        'browser/web_applications/web_app_win.h',
+        'browser/web_applications/web_app_win.cc',
+        'browser/web_resource/eula_accepted_notifier.cc',
+        'browser/web_resource/eula_accepted_notifier.h',
+        'browser/web_resource/json_asynchronous_unpacker.cc',
+        'browser/web_resource/json_asynchronous_unpacker.h',
+        'browser/web_resource/notification_promo.cc',
+        'browser/web_resource/notification_promo.h',
+        'browser/web_resource/promo_resource_service.cc',
+        'browser/web_resource/promo_resource_service.h',
+        'browser/web_resource/resource_request_allowed_notifier.cc',
+        'browser/web_resource/resource_request_allowed_notifier.h',
+        'browser/web_resource/web_resource_service.cc',
+        'browser/web_resource/web_resource_service.h',
+        'browser/webdata/autocomplete_syncable_service.cc',
+        'browser/webdata/autocomplete_syncable_service.h',
+        'browser/webdata/autofill_profile_syncable_service.cc',
+        'browser/webdata/autofill_profile_syncable_service.h',
+        'browser/webdata/keyword_table.cc',
+        'browser/webdata/keyword_table.h',
+        'browser/webdata/logins_table.cc',
+        'browser/webdata/logins_table.h',
+        'browser/webdata/logins_table_win.cc',
+        'browser/webdata/token_service_table.cc',
+        'browser/webdata/token_service_table.h',
+        'browser/webdata/token_web_data.cc',
+        'browser/webdata/token_web_data.h',
+        'browser/webdata/web_apps_table.cc',
+        'browser/webdata/web_apps_table.h',
+        'browser/webdata/web_data_service.cc',
+        'browser/webdata/web_data_service.h',
+        'browser/webdata/web_data_service_factory.cc',
+        'browser/webdata/web_data_service_factory.h',
+        'browser/webdata/web_data_service_win.cc',
+        'browser/webdata/web_intents_table.cc',
+        'browser/webdata/web_intents_table.h',
+        # These files are needed by page_cycler.cc
+        'test/base/test_switches.cc',
+        'test/base/test_switches.h',
+        'test/base/chrome_process_util.cc',
+        'test/base/chrome_process_util.h',
+        'test/base/chrome_process_util_mac.cc',
+        'test/perf/perf_test.cc',
+        'test/perf/perf_test.h',
+
+        # These files are generated by GRIT.
+        '<(grit_out_dir)/grit/component_extension_resources_map.cc',
+        '<(grit_out_dir)/grit/devtools_discovery_page_resources_map.cc',
+        '<(grit_out_dir)/grit/theme_resources_map.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/ui_resources_map.cc',
+      ],
+      'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            'apps',
+            'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
+            'browser_extensions',
+            'common/extensions/api/api.gyp:api',
+            'debugger',
+            'installer_util',
+            'sync_file_system_drive_proto',
+            'sync_file_system_proto',
+            '../cc/cc.gyp:cc',
+            '../components/components.gyp:autofill_content_browser',
+            '../components/components.gyp:navigation_interception',
+            '../net/net.gyp:net_with_v8',
+            '../printing/printing.gyp:printing',
+            '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
+            '../third_party/expat/expat.gyp:expat',
+            '../third_party/hunspell/hunspell.gyp:hunspell',
+            '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+            '../third_party/libusb/libusb.gyp:libusb',
+            '../third_party/libyuv/libyuv.gyp:libyuv',
+            '../third_party/npapi/npapi.gyp:npapi',
+            '../third_party/re2/re2.gyp:re2',
+            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
+            '../ui/gl/gl.gyp:gl',
+            '../ui/surface/surface.gyp:surface',
+            '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
+            '../v8/tools/gyp/v8.gyp:v8',
+            '../webkit/common/webkit_common.gyp:webkit_common',
+            '../webkit/storage_browser.gyp:webkit_storage_browser',
+            '../webkit/storage_common.gyp:webkit_storage_common',
+            '../webkit/webkit_resources.gyp:webkit_resources',
+          ],
+          'defines': [
+            '<@(nacl_defines)',
+          ],
+          'direct_dependent_settings': {
+            'defines': [
+              '<@(nacl_defines)',
+            ],
+          },
+        }, {  # OS == "ios"
+          'dependencies': [
+            '../net/net.gyp:net',
+          ],
+          'sources/': [
+            # Exclude everything but iOS-specific files.
+            ['exclude', '\\.(cc|mm)$'],
+            ['include', '_ios\\.(cc|mm)$'],
+            ['include', '(^|/)ios/'],
+            # TODO(ios): Add files here as they are updated to compile on iOS.
+            ['include', '^browser/browser_process\\.cc$'],
+            ['include', '^browser/browser_process_platform_part_base\\.cc$'],
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/CoreTelephony.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
+              '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework',
+              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+            ],
+            # CoreImage is iOS 5+, but iOS 4.3 is still supported.
+            'xcode_settings': {'OTHER_LDFLAGS': ['-weak_framework CoreImage']},
+          },
+        }],
+        ['OS=="win" or OS=="mac"', {
+          'sources': [
+            'browser/media_galleries/fileapi/itunes_data_provider.cc',
+            'browser/media_galleries/fileapi/itunes_data_provider.h',
+            'browser/media_galleries/fileapi/itunes_file_util.cc',
+            'browser/media_galleries/fileapi/itunes_file_util.h',
+            'browser/media_galleries/fileapi/picasa/picasa_data_provider.cc',
+            'browser/media_galleries/fileapi/picasa/picasa_data_provider.h',
+            'browser/media_galleries/fileapi/picasa/picasa_file_util.cc',
+            'browser/media_galleries/fileapi/picasa/picasa_file_util.h',
+            'browser/media_galleries/fileapi/safe_itunes_library_parser.cc',
+            'browser/media_galleries/fileapi/safe_itunes_library_parser.h',
+            'browser/media_galleries/fileapi/safe_itunes_pref_parser_win.cc',
+            'browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h',
+            'browser/media_galleries/fileapi/safe_picasa_album_table_reader.cc',
+            'browser/media_galleries/fileapi/safe_picasa_album_table_reader.h',
+            'browser/media_galleries/fileapi/safe_picasa_albums_indexer.cc',
+            'browser/media_galleries/fileapi/safe_picasa_albums_indexer.h',
+          ],
+        }],
+        ['enable_extensions==1', {
+          'sources': [
+            # Only extension API implementations should go here.
+            'browser/accessibility/accessibility_extension_api.cc',
+            'browser/accessibility/accessibility_extension_api.h',
+            'browser/infobars/infobar_extension_api.cc',
+            'browser/infobars/infobar_extension_api.h',
+            'browser/rlz/rlz_extension_api.cc',
+            'browser/rlz/rlz_extension_api.h',
+            'browser/speech/extension_api/tts_extension_api.cc',
+            'browser/speech/extension_api/tts_extension_api.h',
+            'browser/speech/extension_api/tts_engine_extension_api.cc',
+            'browser/speech/extension_api/tts_engine_extension_api.h',
+          ],
+        }, {
+          'sources!': [
+            'browser/content_settings/content_settings_custom_extension_provider.cc',
+            'browser/content_settings/content_settings_custom_extension_provider.h',
+            'browser/content_settings/content_settings_internal_extension_provider.cc',
+            'browser/content_settings/content_settings_internal_extension_provider.h',
+          ],
+        }],
+        ['enable_background==0', {
+          'sources/': [
+            ['exclude', '^browser/background/'],
+          ],
+        }],
+        ['enable_task_manager==0', {
+          'sources/': [
+            ['exclude', '^browser/task_manager/'],
+          ],
+        }],
+        ['enable_spellcheck==0', {
+          'sources/': [
+             ['exclude', '^browser/spellchecker/'],
+          ],
+          'dependencies!': [
+            '../third_party/hunspell/hunspell.gyp:hunspell',
+          ],
+        }],
+        ['disable_nacl==0', {
+          'sources': [
+            'browser/nacl_host/nacl_broker_host_win.cc',
+            'browser/nacl_host/nacl_broker_host_win.h',
+            'browser/nacl_host/nacl_broker_service_win.cc',
+            'browser/nacl_host/nacl_broker_service_win.h',
+            'browser/nacl_host/nacl_browser.cc',
+            'browser/nacl_host/nacl_browser.h',
+            'browser/nacl_host/nacl_browser_delegate_impl.cc',
+            'browser/nacl_host/nacl_browser_delegate_impl.h',
+            'browser/nacl_host/nacl_file_host.cc',
+            'browser/nacl_host/nacl_file_host.h',
+            'browser/nacl_host/nacl_host_message_filter.cc',
+            'browser/nacl_host/nacl_host_message_filter.h',
+            'browser/nacl_host/nacl_infobar_delegate.cc',
+            'browser/nacl_host/nacl_infobar_delegate.h',
+            'browser/nacl_host/nacl_process_host.cc',
+            'browser/nacl_host/nacl_process_host.h',
+            'browser/nacl_host/nacl_validation_cache.cc',
+            'browser/nacl_host/nacl_validation_cache.h',
+            'browser/nacl_host/pnacl_host.cc',
+            'browser/nacl_host/pnacl_host.h',
+            'browser/nacl_host/pnacl_translation_cache.cc',
+            'browser/nacl_host/pnacl_translation_cache.h',
+            '../components/nacl/common/nacl_debug_exception_handler_win.cc',
+            '../components/nacl/common/nacl_debug_exception_handler_win.h',
+          ],
+          'dependencies': [
+            '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
+          ],
+        }],
+        ['debug_devtools==1', {
+          'defines': [
+            'DEBUG_DEVTOOLS=1',
+          ],
+        }],
+        ['configuration_policy==1', {
+          'sources!': [
+            'browser/policy/policy_service_stub.cc',
+            'browser/policy/policy_service_stub.h',
+            'browser/policy/profile_policy_connector_stub.cc',
+          ],
+          'dependencies': [
+            'app/policy/cloud_policy_codegen.gyp:policy',
+            'cloud_policy_proto',
+          ],
+          'conditions': [
+            ['OS!="android"', {
+              'dependencies': [
+                'policy_path_parser',
+              ],
+            }],
+          ],
+        }, {  # configuration_policy==0
+          'sources/': [
+            ['exclude', '^browser/policy/'],
+            ['include', 'browser/policy/external_data_fetcher.cc'],
+            ['include', 'browser/policy/external_data_fetcher.h'],
+            ['include', 'browser/policy/external_data_manager.h'],
+            ['include', 'browser/policy/policy_domain_descriptor.h'],
+            ['include', 'browser/policy/policy_map.cc'],
+            ['include', 'browser/policy/policy_map.h'],
+            ['include', 'browser/policy/policy_service.cc'],
+            ['include', 'browser/policy/policy_service.h'],
+            ['include', 'browser/policy/policy_service_stub.cc'],
+            ['include', 'browser/policy/policy_service_stub.h'],
+            ['include', 'browser/policy/profile_policy_connector_stub.cc'],
+            ['include', 'browser/policy/profile_policy_connector.h'],
+            ['include', 'browser/policy/profile_policy_connector_factory.cc'],
+            ['include', 'browser/policy/profile_policy_connector_factory.h'],
+            ['include', 'browser/policy/url_blacklist_manager.cc'],
+            ['include', 'browser/policy/url_blacklist_manager.h'],
+          ],
+        }],
+        ['enable_plugins==1', {
+          'dependencies': [
+            '../ppapi/ppapi_internal.gyp:ppapi_ipc',
+          ],
+        }, {  # enable_plugins==0
+          'sources/': [
+            ['exclude', '^browser/pepper_'],
+            ['exclude', '^browser/plugins/'],
+            ['exclude', '^browser/renderer_host/pepper/'],
+          ],
+        }],
+        ['safe_browsing==1', {
+          'defines': [
+            'FULL_SAFE_BROWSING',
+          ],
+        }],
+        ['safe_browsing==2', {
+          'defines': [
+            'MOBILE_SAFE_BROWSING',
+          ],
+          'dependencies!': [
+            'safe_browsing_proto',
+          ],
+         'sources!': [
+            'browser/renderer_host/safe_browsing_resource_throttle.cc',
+            'browser/renderer_host/safe_browsing_resource_throttle.h',
+          ],
+          'sources/': [
+            ['exclude', '^browser/safe_browsing/'],
+            ['include', '^browser/safe_browsing/malware_details.cc'],
+            ['include', '^browser/safe_browsing/malware_details.h'],
+            ['include', '^browser/safe_browsing/malware_details_cache.cc'],
+            ['include', '^browser/safe_browsing/malware_details_cache.h'],
+            ['include', '^browser/safe_browsing/malware_details_history.cc'],
+            ['include', '^browser/safe_browsing/malware_details_history.h'],
+            ['include', '^browser/safe_browsing/ping_manager.cc'],
+            ['include', '^browser/safe_browsing/ping_manager.h'],
+            ['include', '^browser/safe_browsing/protocol_manager_helper.cc'],
+            ['include', '^browser/safe_browsing/protocol_manager_helper.h'],
+            ['include', '^browser/safe_browsing/safe_browsing_blocking_page.cc'],
+            ['include', '^browser/safe_browsing/safe_browsing_blocking_page.h'],
+            ['include', '^browser/safe_browsing/safe_browsing_service.cc'],
+            ['include', '^browser/safe_browsing/safe_browsing_service.h'],
+            ['include', '^browser/safe_browsing/safe_browsing_tab_observer.cc'],
+            ['include', '^browser/safe_browsing/safe_browsing_tab_observer.h'],
+            ['include', '^browser/safe_browsing/safe_browsing_util.cc'],
+            ['include', '^browser/safe_browsing/safe_browsing_util.h'],
+            ['include', '^browser/safe_browsing/ui_manager.cc'],
+            ['include', '^browser/safe_browsing/ui_manager.h'],
+          ],
+        }],
+        ['safe_browsing==0', {
+          'dependencies!': [
+            'safe_browsing_proto',
+            'safe_browsing_report_proto',
+          ],
+          'sources!': [
+            'browser/renderer_host/safe_browsing_resource_throttle.cc',
+            'browser/renderer_host/safe_browsing_resource_throttle.h',
+            'browser/renderer_host/safe_browsing_resource_throttle_factory.cc',
+            'browser/renderer_host/safe_browsing_resource_throttle_factory.h',
+          ],
+          'sources/': [
+            ['exclude', '^browser/safe_browsing/'],
+            ['include', '^browser/safe_browsing/safe_browsing_tab_observer.cc'],
+            ['include', '^browser/safe_browsing/safe_browsing_tab_observer.h'],
+          ],
+        }],
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:udev',
+            '../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_file_entry_proto',
+            '../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_storage_info_proto',
+            '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
+          ],
+        }],
+        ['OS=="linux" and chromeos==0', {
+          'dependencies': [
+            '../build/linux/system.gyp:libspeechd',
+          ],
+        }],
+        ['chromeos==0', {
+          'sources!': [
+            'browser/extensions/api/input_ime/input_ime_api.cc',
+            'browser/extensions/api/input_ime/input_ime_api.h',
+            'browser/extensions/api/terminal/terminal_extension_helper.cc',
+            'browser/extensions/api/terminal/terminal_extension_helper.h',
+            'browser/extensions/api/terminal/terminal_private_api.cc',
+            'browser/extensions/api/terminal/terminal_private_api.h',
+            'browser/net/gaia/gaia_oauth_consumer.h',
+            'browser/net/gaia/gaia_oauth_fetcher.cc',
+            'browser/net/gaia/gaia_oauth_fetcher.h',
+            'browser/policy/proto/chrome_device_policy.pb.cc',
+            'browser/policy/proto/chrome_device_policy.pb.h',
+            'browser/renderer_host/offline_resource_throttle.cc',
+            'browser/renderer_host/offline_resource_throttle.h',
+          ],
+        }, {  # chromeos==1
+          'dependencies': [
+            'browser_chromeos',
+          ],
+          'sources!': [
+            'browser/first_run/upgrade_util.cc',
+            'browser/first_run/upgrade_util.h',
+            'browser/first_run/upgrade_util_linux.cc',
+            'browser/icon_loader_linux.cc',
+            'browser/icon_manager_linux.cc',
+            'browser/idle_linux.cc',
+            'browser/password_manager/native_backend_gnome_x.cc',
+            'browser/password_manager/native_backend_gnome_x.h',
+            'browser/password_manager/native_backend_kwallet_x.cc',
+            'browser/password_manager/native_backend_kwallet_x.h',
+            'browser/platform_util_linux.cc',
+            'browser/policy/cloud/cloud_policy_client_registration_helper.cc',
+            'browser/policy/cloud/cloud_policy_client_registration_helper.h',
+            'browser/policy/cloud/user_cloud_policy_manager.cc',
+            'browser/policy/cloud/user_cloud_policy_manager.h',
+            'browser/policy/cloud/user_cloud_policy_manager_factory.cc',
+            'browser/policy/cloud/user_cloud_policy_manager_factory.h',
+            'browser/policy/cloud/user_cloud_policy_store.cc',
+            'browser/policy/cloud/user_cloud_policy_store.h',
+            'browser/policy/cloud/user_policy_signin_service.cc',
+            'browser/policy/cloud/user_policy_signin_service.h',
+            'browser/policy/cloud/user_policy_signin_service_base.cc',
+            'browser/policy/cloud/user_policy_signin_service_base.h',
+            'browser/policy/cloud/user_policy_signin_service_factory.cc',
+            'browser/policy/cloud/user_policy_signin_service_factory.h',
+            'browser/screensaver_window_finder_x11.cc',
+            'browser/screensaver_window_finder_x11.h',
+            'browser/signin/signin_manager.cc',
+            'browser/speech/tts_linux.cc',
+            'browser/storage_monitor/mtab_watcher_linux.cc',
+            'browser/storage_monitor/mtab_watcher_linux.h',
+            'browser/storage_monitor/storage_monitor_linux.cc',
+            'browser/storage_monitor/storage_monitor_linux.h',
+            'browser/sxs_linux.cc',
+            'browser/sxs_linux.h',
+            'browser/themes/theme_service_aurax11.cc',
+            'browser/themes/theme_service_aurax11.h',
+            'browser/ui/webui/help/version_updater_basic.cc',
+            'browser/ui/webui/help/version_updater_basic.h',
+            'browser/upgrade_detector_impl.cc',
+            'browser/upgrade_detector_impl.h',
+          ],
+        }],
+        ['use_cups==1', {
+          'dependencies': [
+            '../printing/printing.gyp:cups',
+          ],
+        }],
+        ['use_gnome_keyring==0', {
+          'sources!': [
+            'browser/password_manager/native_backend_gnome_x.cc',
+            'browser/password_manager/native_backend_gnome_x.h',
+          ],
+        }],
+        ['use_aura==1', {
+          'sources/': [
+            ['exclude', '^browser/automation/testing_automation_provider_win.cc'],
+            ['exclude', '^browser/hang_monitor/hung_plugin_action.cc'],
+            ['exclude', '^browser/hang_monitor/hung_plugin_action.h'],
+            ['exclude', '^browser/hang_monitor/hung_window_detector.cc'],
+            ['exclude', '^browser/hang_monitor/hung_window_detector.h'],
+            ['exclude', '^browser/jumplist_win.cc'],
+            ['exclude', '^browser/jumplist_win.h'],
+            ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
+            ['exclude', '^browser/renderer_host/render_widget_host_view_views*'],
+          ],
+          'dependencies': [
+            '../ui/aura/aura.gyp:aura',
+            '../ui/compositor/compositor.gyp:compositor',
+            '../ui/keyboard/keyboard.gyp:keyboard',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'sources/': [
+                ['exclude', '^browser/automation/automation_provider_aura.cc'],
+                ['exclude', '^browser/background/background_mode_manager_aura.cc'],
+                ['exclude', '^browser/lifetime/application_lifetime_win.cc'],
+              ],
+              'dependencies': [
+                'launcher_support',
+                '../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages',
+                '../win8/win8.gyp:metro_viewer',
+              ],
+            }],
+          ],
+        }],
+        ['ui_compositor_image_transport==1', {
+          'dependencies': [
+            '../ui/gl/gl.gyp:gl',
+          ],
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+          'link_settings': {
+            'libraries': [
+              '-lXss',
+            ],
+          },
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+          'sources': [
+            'app/breakpad_linux.cc',
+            'app/breakpad_linux.h',
+            'app/chrome_breakpad_client.cc',
+            'app/chrome_breakpad_client.h',
+            'browser/crash_handler_host_linux.cc',
+            'browser/crash_handler_host_linux.h',
+          ],
+          'dependencies': [
+            '../breakpad/breakpad.gyp:breakpad_client',
+            '../components/components.gyp:breakpad_component',
+            # make sure file_version_info_linux.h is generated first.
+            'common',
+          ],
+          'include_dirs': [
+            # breakpad_linux.cc uses generated file_version_info_linux.h.
+            '<(SHARED_INTERMEDIATE_DIR)',
+            '../breakpad/src',
+          ],
+        }],
+        ['use_nss==1', {
+          'sources': [
+            'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
+            'third_party/mozilla_security_manager/nsNSSCertHelper.h',
+            'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
+            'third_party/mozilla_security_manager/nsNSSCertificate.h',
+            'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
+            'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
+          ],
+        }, {  # use_nss==0
+          'sources!': [
+            'browser/certificate_manager_model.cc',
+            'browser/certificate_manager_model.h',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../build/linux/system.gyp:gconf',
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:gtkprint',
+            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:x11',
+            '../dbus/dbus.gyp:dbus',
+            '../third_party/undoview/undoview.gyp:undoview',
+          ],
+          'conditions': [
+            ['OS=="linux"', {
+              'link_settings': {
+                'libraries': [
+                  # For dlsym() in 'browser/zygote_main_linux.cc'
+                  '-ldl',
+                ],
+              },
+            }],
+            ['use_gnome_keyring==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gnome_keyring',
+              ],
+            }],
+          ],
+        }],
+        ['input_speech==0', {
+          'sources/': [
+            ['exclude', '^browser/speech/chrome_speech_recognition_manager_delegate_bubble_ui'],
+            ['exclude', '^browser/speech/speech_recognition_bubble'],
+          ],
+        }],
+        ['notifications==0', {
+          'sources/': [
+            ['exclude', '^browser/notifications/'],
+          ],
+        }],
+        ['enable_themes==0', {
+          'sources!': [
+            'browser/sync/glue/theme_data_type_controller.cc',
+          ],
+          'sources/': [
+            ['exclude', '^browser/themes/'],
+          ],
+        }],
+        ['enable_automation!=1', {
+          'sources/': [
+            ['exclude', '^browser/automation/'],
+          ],
+        }],
+        ['enable_printing==0', {
+          'sources/': [
+            ['exclude', '^browser/printing/'],
+          ],
+        }],
+        ['enable_printing==1', {
+          'sources/': [
+            ['exclude', '^browser/printing/print_view_manager_basic.*'],
+          ],
+        }],
+        ['enable_printing==2', {
+          'sources/': [
+            ['exclude', '^browser/printing/background_printing_manager.*'],
+            ['exclude', '^browser/printing/print_view_manager.cc'],
+            ['exclude', '^browser/printing/print_error_dialog.*'],
+            ['exclude', '^browser/printing/print_preview.*'],
+            ['exclude', '^browser/printing/print_system_task_proxy.*'],
+            ['exclude', '^browser/printing/print_view_manager.cc'],
+            ['exclude', '^browser/printing/print_view_manager.h'],
+            ['exclude', '^browser/printing/printer_manager_dialog.*'],
+          ],
+        }],
+        ['enable_captive_portal_detection!=1', {
+          'sources/': [
+            ['exclude', '^browser/captive_portal/'],
+          ],
+        }],
+        ['enable_session_service!=1', {
+          'sources!': [
+            'browser/sessions/session_restore.cc',
+            'browser/sessions/session_service.cc',
+            'browser/sessions/session_service.h',
+            'browser/sessions/session_service_factory.cc',
+            'browser/sessions/session_service_factory.h',
+          ],
+        }],
+        ['OS=="android" or OS=="ios"', {
+          'sources!': [
+            'browser/chrome_browser_field_trials_desktop.cc',
+            'browser/chrome_browser_field_trials_desktop.h',
+          ],
+        }, {  # OS!="android" and OS!="ios"
+          'sources!': [
+            'browser/chrome_browser_field_trials_mobile.cc',
+            'browser/chrome_browser_field_trials_mobile.h',
+            'browser/metrics/variations/variations_request_scheduler_mobile.cc',
+            'browser/metrics/variations/variations_request_scheduler_mobile.h',
+          ],
+        }],
+        ['OS=="android"', {
+          'dependencies': [
+            '../components/components.gyp:web_contents_delegate_android',
+            'chrome_browser_jni_headers',
+          ],
+          'dependencies!': [
+            '../components/components.gyp:web_modal',
+            '../third_party/libusb/libusb.gyp:libusb',
+          ],
+          'sources': [
+            'browser/sessions/in_memory_tab_restore_service.cc',
+            'browser/sessions/in_memory_tab_restore_service.h',
+            'browser/signin/android_profile_oauth2_token_service.cc',
+            'browser/signin/android_profile_oauth2_token_service.h',
+            'browser/ssl/ssl_add_certificate_android.cc',
+            'browser/web_resource/notification_promo_mobile_ntp.cc',
+            'browser/web_resource/notification_promo_mobile_ntp.h',
+          ],
+          'sources!': [
+            # Bookmark export/import are handled via the BookmarkColumns
+            # ContentProvider.
+            'browser/bookmarks/bookmark_html_writer.cc',
+            'browser/ssl/ssl_add_certificate.cc',
+
+            'browser/jankometer.cc',
+            'browser/sync/sync_global_error.cc',
+            'browser/sync/sync_global_error.h',
+
+            'browser/download/download_crx_util.cc',
+            'browser/net/gaia/gaia_oauth_fetcher.cc',
+            'browser/page_cycler/page_cycler.cc',
+            'browser/page_cycler/page_cycler.h',
+            'browser/policy/async_policy_loader.cc',
+            'browser/policy/async_policy_loader.h',
+            'browser/policy/async_policy_provider.cc',
+            'browser/policy/async_policy_provider.h',
+            'browser/policy/cloud/cloud_external_data_manager_base.cc',
+            'browser/policy/cloud/cloud_external_data_manager_base.h',
+            'browser/policy/cloud/cloud_external_data_store.cc',
+            'browser/policy/cloud/cloud_external_data_store.h',
+            'browser/policy/cloud/component_cloud_policy_service.cc',
+            'browser/policy/cloud/component_cloud_policy_service.h',
+            'browser/policy/cloud/component_cloud_policy_store.cc',
+            'browser/policy/cloud/component_cloud_policy_store.h',
+            'browser/policy/cloud/component_cloud_policy_updater.cc',
+            'browser/policy/cloud/component_cloud_policy_updater.h',
+            'browser/policy/cloud/external_policy_data_updater.cc',
+            'browser/policy/cloud/external_policy_data_updater.h',
+            'browser/policy/cloud/resource_cache.cc',
+            'browser/policy/cloud/resource_cache.h',
+            'browser/policy/cloud/user_policy_signin_service.cc',
+            'browser/policy/cloud/user_policy_signin_service.h',
+            'browser/policy/config_dir_policy_loader.cc',
+            'browser/policy/config_dir_policy_loader.h',
+            'browser/policy/managed_mode_policy_provider.cc',
+            'browser/policy/managed_mode_policy_provider.h',
+            'browser/profiles/profile_loader.cc',
+            'browser/profiles/profile_loader.h',
+            'browser/sessions/persistent_tab_restore_service.cc',
+            'browser/sessions/persistent_tab_restore_service.h',
+            'browser/sessions/session_backend.cc',
+            'browser/sessions/session_backend.h',
+            'browser/tab_contents/background_contents.cc',
+            'browser/tab_contents/background_contents.h',
+            'browser/tab_contents/render_view_context_menu.cc',
+            'browser/tab_contents/render_view_context_menu.h',
+            'browser/tab_contents/render_view_context_menu_observer.cc',
+            'browser/tab_contents/render_view_context_menu_observer.h',
+            'browser/tab_contents/spellchecker_submenu_observer.h',
+            'browser/tab_contents/spellchecker_submenu_observer_hunspell.cc',
+            'browser/tab_contents/spelling_bubble_model.cc',
+            'browser/tab_contents/spelling_bubble_model.h',
+            'browser/tab_contents/spelling_menu_observer.cc',
+            'browser/tab_contents/spelling_menu_observer.h',
+            'browser/upgrade_detector_impl.cc',
+            'browser/upgrade_detector_impl.h',
+
+            # User Stylesheet unsupported on Android (crbug.com/236696)
+            'browser/user_style_sheet_watcher.cc',
+            'browser/user_style_sheet_watcher.h',
+            'browser/user_style_sheet_watcher_factory.cc',
+            'browser/user_style_sheet_watcher_factory.h',
+
+            # Not used by Android
+            'browser/chrome_browser_main_posix.cc',
+            'browser/chrome_browser_main_posix.h',
+            'browser/chrome_process_singleton.cc',
+            'browser/process_singleton.cc',
+
+            # Android uses a different invalidation service
+            'browser/invalidation/ticl_invalidation_service.cc',
+            'browser/invalidation/ticl_invalidation_service.h',
+
+            'browser/sync/glue/synced_tab_delegate.cc',
+          ],
+          'sources/': [
+            ['exclude', '^browser/captive_portal/'],
+            ['exclude', '^browser/diagnostics/'],
+            ['exclude', '^browser/first_run/'],
+            ['exclude', '^browser/importer/'],
+            ['exclude', '^browser/media_galleries/'],
+            ['exclude', '^browser/net/firefox_*'],
+            ['exclude', '^browser/service/'],
+            ['exclude', '^browser/sync/glue/app_'],
+            ['exclude', '^browser/sync/glue/extension_'],
+            ['exclude', '^browser/sync/glue/theme_'],
+            ['exclude', '^browser/usb/'],
+          ],
+        }],
+        ['OS=="mac"', {
+          'sources!': [
+            'browser/automation/automation_provider_list_generic.cc',
+            'browser/first_run/upgrade_util.cc',
+            'browser/jankometer.cc',
+            'browser/lifetime/application_lifetime_stub.cc',
+            'browser/password_manager/login_database_posix.cc',
+            'browser/tab_contents/spellchecker_submenu_observer_hunspell.cc',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
+              '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework',
+              '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
+              '$(SDKROOT)/System/Library/Frameworks/DiskArbitration.framework',
+              '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
+              '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework',
+              '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+              '$(SDKROOT)/System/Library/Frameworks/SecurityInterface.framework',
+            ],
+          },
+          'sources': [
+            # Build the necessary GTM sources
+            '../third_party/GTM/Foundation/GTMServiceManagement.h',
+            '../third_party/GTM/Foundation/GTMServiceManagement.c',
+          ],
+          'include_dirs': [
+            '../third_party/GTM',
+            '../third_party/GTM/Foundation',
+          ],
+        }],
+        ['enable_rlz==1', {
+          'dependencies': [
+            '../rlz/rlz.gyp:rlz_lib',
+          ],
+        }, {  # enable_rlz!=1
+          'sources/': [
+            # Exclude all of rlz.
+            ['exclude', '^browser/rlz/'],
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'dependencies': [
+            'chrome_process_finder',
+            'installer_util_strings',
+            '../google_update/google_update.gyp:google_update',
+            '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+            '../third_party/isimpledom/isimpledom.gyp:isimpledom',
+            '../ui/views/controls/webview/webview.gyp:webview',
+            '../ui/views/views.gyp:views',
+            '../win8/win8.gyp:win8_util',
+          ],
+          'export_dependent_settings': [
+            '../ui/views/controls/webview/webview.gyp:webview',
+            '../ui/views/views.gyp:views',
+          ],
+          'sources': [
+            # Using built-in rule in vstudio for midl.
+            'browser/history/history_indexer.idl',
+          ],
+          'sources!': [
+            'browser/first_run/first_run_dialog.h',
+            'browser/history/history_publisher_none.cc',
+            'browser/lifetime/application_lifetime_stub.cc',
+            'browser/profiles/profile_shortcut_manager_stub.cc',
+            'browser/user_data_dir_extractor.cc',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+        }, {  # 'OS!="win"
+          'sources/': [
+            # Exclude files that should be excluded for all non-Windows platforms.
+            ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
+            ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
+
+            # Exclude all of hang_monitor.
+            ['exclude', '^browser/hang_monitor/'],
+          ],
+          'conditions': [
+            ['use_aura==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:dbus',
+                '../build/linux/system.gyp:fontconfig',
+                '../build/linux/system.gyp:x11',
+                '../dbus/dbus.gyp:dbus',
+                '../ui/views/controls/webview/webview.gyp:webview',
+                '../ui/views/views.gyp:views',
+              ],
+              'include_dirs': [
+                '<(INTERMEDIATE_DIR)',
+                '<(INTERMEDIATE_DIR)/chrome',
+              ],
+              'sources/': [
+                ['exclude', '^browser/platform_util_common_linux.cc'],
+                ['include', '^browser/printing/print_dialog_cloud.cc'],
+                ['include', '^browser/printing/print_dialog_cloud.h'],
+              ],
+            }],
+            # GTK build only
+            ['toolkit_uses_gtk==1', {
+              'sources/': [
+                ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
+              ],
+            }],
+            ['gcc_version == 45', {
+              # Avoid gcc 4.5 miscompilation of template_url.cc
+              # as per http://crbug.com/41887
+              'cflags': [
+                '-fno-ipa-cp',
+              ],
+            }],
+          ],
+        }],
+        ['enable_plugin_installation==0', {
+          'sources!': [
+            'browser/plugins/plugin_installer.cc',
+            'browser/plugins/plugin_installer.h',
+            'browser/plugins/plugin_installer_observer.cc',
+            'browser/plugins/plugin_installer_observer.h',
+            'browser/plugins/plugins_resource_service.cc',
+            'browser/plugins/plugins_resource_service.h',
+          ],
+        }],
+        ['enable_app_list==1', {
+          'dependencies': [
+            '../ui/app_list/app_list.gyp:app_list',
+          ]
+        }],
+        ['enable_managed_users!=1', {
+          'sources/': [
+            ['exclude', '^browser/managed_mode/'],
+          ]
+        }],
+        ['enable_webrtc==0', {
+          'sources!': [
+            'browser/media/webrtc_log_upload_list.cc',
+            'browser/media/webrtc_log_upload_list.h',
+            'browser/media/webrtc_log_uploader.cc',
+            'browser/media/webrtc_log_uploader.h',
+            'browser/media/webrtc_logging_handler_host.cc',
+            'browser/media/webrtc_logging_handler_host.h',
+          ]
+        }],
+        ['enable_mdns==1', {
+            'sources' : [
+              'browser/local_discovery/privet_device_lister.h',
+              'browser/local_discovery/privet_device_lister.cc',
+              'browser/local_discovery/privet_device_lister_impl.h',
+              'browser/local_discovery/privet_device_lister_impl.cc',
+              'browser/local_discovery/service_discovery_host_client.cc',
+              'browser/local_discovery/service_discovery_host_client.h',
+            ]
+        }]
+      ],
+      'target_conditions': [
+        # Need 'target_conditions' to override default filename_rules to include
+        # the files on Android.
+        ['OS=="android"', {
+          'sources/': [
+            ['include', '^app/breakpad_linux\\.cc$'],
+            ['include', '^browser/crash_handler_host_linux\\.cc$'],
+          ],
+        }],
+      ],
+    },
+    {
+      # Protobuf compiler / generator for the fraudulent certificate reporting
+      # protocol buffer.
+      'target_name': 'cert_logger_proto',
+      'type': 'static_library',
+      'sources': [ 'browser/net/cert_logger.proto', ],
+      'variables': {
+        'proto_in_dir': 'browser/net',
+        'proto_out_dir': 'chrome/browser/net',
+      },
+      'includes': [ '../build/protoc.gypi', ],
+    },
+    {
+      # Protobuf compiler / generator for Probe Message.
+      'target_name': 'probe_message_proto',
+      'type': 'static_library',
+      'sources': [ 'browser/net/probe_message.proto' ],
+      'variables': {
+        'proto_in_dir': 'browser/net',
+        'proto_out_dir': 'chrome/browser/net',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generate rule for feedback
+      'target_name': 'feedback_proto',
+      'type': 'static_library',
+      'sources': [
+        'browser/feedback/proto/annotations.proto',
+        'browser/feedback/proto/chrome.proto',
+        'browser/feedback/proto/common.proto',
+        'browser/feedback/proto/dom.proto',
+        'browser/feedback/proto/extension.proto',
+        'browser/feedback/proto/math.proto',
+        'browser/feedback/proto/web.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/feedback/proto',
+        'proto_out_dir': 'chrome/browser/feedback/proto',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generator for the safebrowsing reporting
+      # protocol buffer.
+      'target_name': 'safe_browsing_report_proto',
+      'type': 'static_library',
+      'sources': [ 'browser/safe_browsing/report.proto' ],
+      'variables': {
+        'proto_in_dir': 'browser/safe_browsing',
+        'proto_out_dir': 'chrome/browser/safe_browsing',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generator for the InMemoryURLIndex caching
+      # protocol buffer.
+      'target_name': 'in_memory_url_index_cache_proto',
+      'type': 'static_library',
+      'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
+      'variables': {
+        'proto_in_dir': 'browser/history',
+        'proto_out_dir': 'chrome/browser/history',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generator for Chrome Variations seed.
+      'target_name': 'variations_seed_proto',
+      'type': 'static_library',
+      'sources': [
+        'browser/metrics/proto/trials_seed.proto',
+        'browser/metrics/proto/study.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/metrics/proto',
+        'proto_out_dir': 'chrome/browser/metrics/proto',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generator for Sync FileSystem protocol buffer.
+      'target_name': 'sync_file_system_proto',
+      'type': 'static_library',
+      'sources': [
+        'browser/sync_file_system/sync_file_system.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/sync_file_system',
+        'proto_out_dir': 'chrome/browser/sync_file_system',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generator for Sync FileSystem protocol buffer.
+      'target_name': 'sync_file_system_drive_proto',
+      'type': 'static_library',
+      'sources': [
+        'browser/sync_file_system/drive_backend/metadata_database.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/sync_file_system/drive_backend',
+        'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generator for cloud policy protocol buffers.
+      'target_name': 'cloud_policy_proto',
+      'type': 'static_library',
+      'sources': [
+        'browser/policy/proto/cloud/chrome_extension_policy.proto',
+        'browser/policy/proto/cloud/device_management_backend.proto',
+        'browser/policy/proto/cloud/device_management_local.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/policy/proto/cloud',
+        'proto_out_dir': 'chrome/browser/policy/proto/cloud',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+  ],
+  'conditions': [
+    ['OS=="android"', {
+      'targets': [
+        {
+          'target_name': 'chrome_browser_jni_headers',
+          'type': 'none',
+          'sources': [
+            'android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java',
+            'android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java',
+            'android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java',
+            'android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java',
+            'android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java',
+            'android/java/src/org/chromium/chrome/browser/CertificateViewer.java',
+            'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java',
+            'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',
+            'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java',
+            'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java',
+            'android/java/src/org/chromium/chrome/browser/DevToolsServer.java',
+            'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java',
+            'android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java',
+            'android/java/src/org/chromium/chrome/browser/FieldTrialHelper.java',
+            'android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java',
+            'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
+            'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
+            'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
+            'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java',
+            'android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java',
+            'android/java/src/org/chromium/chrome/browser/profiles/Profile.java',
+            'android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java',
+            'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java',
+            'android/java/src/org/chromium/chrome/browser/signin/AndroidProfileOAuth2TokenServiceHelper.java',
+            'android/java/src/org/chromium/chrome/browser/signin/SigninManager.java',
+            'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',
+            'android/java/src/org/chromium/chrome/browser/TabBase.java',
+            'android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java',
+            'android/java/src/org/chromium/chrome/browser/ValidationMessageBubble.java',
+            'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'chrome',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
+          'target_name': 'resource_id_java',
+          'type': 'none',
+          'sources': [
+            'android/java/ResourceId.template',
+          ],
+          'variables': {
+            'package_name': 'org/chromium/chrome/browser',
+            'template_deps': ['browser/android/resource_id.h'],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        },
+        {
+          'target_name': 'profile_sync_service_model_type_selection_java',
+          'type': 'none',
+          'sources': [
+            'android/java/ModelTypeSelection.template',
+          ],
+          'variables': {
+            'package_name': 'org/chromium/chrome/browser/sync',
+            'template_deps': ['browser/sync/profile_sync_service_model_type_selection_android.h'],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        },
+        {
+          'target_name': 'toolbar_model_security_levels_java',
+          'type': 'none',
+          'sources': [
+            'android/java/ToolbarModelSecurityLevel.template',
+          ],
+          'variables': {
+            'package_name': 'org/chromium/chrome/browser/ui/toolbar',
+            'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        },
+      ],
+     },
+    ],
+  ],
+}
diff --git a/chromium/chrome/chrome_browser_chromeos.gypi b/chromium/chrome/chrome_browser_chromeos.gypi
new file mode 100644
index 00000000000..6a8668be57c
--- /dev/null
+++ b/chromium/chrome/chrome_browser_chromeos.gypi
@@ -0,0 +1,982 @@
+# Copyright (c) 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'browser_chromeos',
+      'type': 'static_library',
+      'variables': {
+        'conditions': [
+          ['sysroot!=""', {
+            'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
+          }, {
+            'pkg-config': 'pkg-config'
+          }],
+        ],
+        # Override to dynamically link the cras (ChromeOS audio) library.
+        'use_cras%': 0,
+        'enable_wexit_time_destructors': 1,
+      },
+      'dependencies': [
+        # TODO(tbarzic): Cleanup this list.
+        'attestation_proto',
+        'app/policy/cloud_policy_codegen.gyp:policy',
+        'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
+        'browser_extensions',
+        'cert_logger_proto',
+        'chrome_resources.gyp:chrome_extra_resources',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:platform_locale_settings',
+        'chrome_resources.gyp:theme_resources',
+        'common',
+        'common/extensions/api/api.gyp:api',
+        'common_net',
+        'contacts_proto',
+        'debugger',
+        'device_policy_proto',
+        'drive_proto',
+        'feedback_proto',
+        'in_memory_url_index_cache_proto',
+        'installer_util',
+        'safe_browsing_proto',
+        'safe_browsing_report_proto',
+        'variations_seed_proto',
+        '../breakpad/breakpad.gyp:breakpad_client',
+        '../build/linux/system.gyp:dbus',
+        '../chromeos/chromeos.gyp:chromeos',
+        '../chromeos/chromeos.gyp:chromeos_memory',
+        # browser_chromeos #includes power_supply_properties.pb.h directly.
+        '../chromeos/chromeos.gyp:power_manager_proto',
+        '../chromeos/ime/input_method.gyp:gencode',
+        '../content/content.gyp:content_browser',
+        '../content/content.gyp:content_common',
+        '../crypto/crypto.gyp:crypto',
+        '../dbus/dbus.gyp:dbus',
+        '../device/bluetooth/bluetooth.gyp:device_bluetooth',
+        '../media/media.gyp:media',
+        '../net/net.gyp:net',
+        '../ppapi/ppapi_internal.gyp:ppapi_ipc',  # For PpapiMsg_LoadPlugin
+        '../printing/printing.gyp:printing',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+        '../third_party/expat/expat.gyp:expat',
+        '../third_party/hunspell/hunspell.gyp:hunspell',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/libevent/libevent.gyp:libevent',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
+        '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+        '../third_party/libusb/libusb.gyp:libusb',
+        '../third_party/libxml/libxml.gyp:libxml',
+        '../third_party/npapi/npapi.gyp:npapi',
+        '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+        '../third_party/protobuf/protobuf.gyp:protoc#host',
+        '../third_party/re2/re2.gyp:re2',
+        '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/surface/surface.gyp:surface',
+        '../ui/ui.gyp:ui',
+        '../ui/ui.gyp:ui_resources',
+        '../ui/views/controls/webview/webview.gyp:webview',
+        '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
+        '../url/url.gyp:url_lib',
+        '../v8/tools/gyp/v8.gyp:v8',
+        '../ui/views/controls/webview/webview.gyp:webview',
+        '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+        '../webkit/storage_browser.gyp:webkit_storage_browser',
+        '../webkit/storage_common.gyp:webkit_storage_common',
+        '../webkit/support/webkit_support.gyp:glue',
+        '../webkit/webkit_resources.gyp:webkit_resources',
+        'chrome_resources.gyp:chrome_strings',
+      ],
+      'defines': [
+        '<@(nacl_defines)',
+      ],
+      'direct_dependent_settings': {
+        'defines': [
+          '<@(nacl_defines)',
+        ],
+      },
+      'export_dependent_settings': [
+        '../sync/sync.gyp:sync',
+      ],
+      'include_dirs': [
+        # breakpad_linux.cc uses generated file_version_info_linux.h.
+        '<(SHARED_INTERMEDIATE_DIR)',
+        '../breakpad/src',
+      ],
+      'sources': [
+        # All .cc, .h, .m, and .mm files under browser/chromeos, except for tests
+        # and mocks.
+        'browser/chromeos/accessibility/accessibility_manager.cc',
+        'browser/chromeos/accessibility/accessibility_manager.h',
+        'browser/chromeos/accessibility/accessibility_util.cc',
+        'browser/chromeos/accessibility/accessibility_util.h',
+        'browser/chromeos/accessibility/magnification_manager.cc',
+        'browser/chromeos/accessibility/magnification_manager.h',
+        'browser/chromeos/app_mode/app_session_lifetime.cc',
+        'browser/chromeos/app_mode/app_session_lifetime.h',
+        'browser/chromeos/app_mode/kiosk_app_data.cc',
+        'browser/chromeos/app_mode/kiosk_app_data.h',
+        'browser/chromeos/app_mode/kiosk_app_data_delegate.h',
+        'browser/chromeos/app_mode/kiosk_app_launcher.cc',
+        'browser/chromeos/app_mode/kiosk_app_launcher.h',
+        'browser/chromeos/app_mode/kiosk_app_launch_error.cc',
+        'browser/chromeos/app_mode/kiosk_app_launch_error.h',
+        'browser/chromeos/app_mode/kiosk_app_manager.cc',
+        'browser/chromeos/app_mode/kiosk_app_manager.h',
+        'browser/chromeos/app_mode/kiosk_app_manager_observer.h',
+        'browser/chromeos/app_mode/kiosk_app_update_service.cc',
+        'browser/chromeos/app_mode/kiosk_app_update_service.h',
+        'browser/chromeos/app_mode/startup_app_launcher.cc',
+        'browser/chromeos/app_mode/startup_app_launcher.h',
+        'browser/chromeos/attestation/attestation_ca_client.cc',
+        'browser/chromeos/attestation/attestation_ca_client.h',
+        'browser/chromeos/attestation/attestation_policy_observer.cc',
+        'browser/chromeos/attestation/attestation_policy_observer.h',
+        'browser/chromeos/audio/audio_devices_pref_handler_impl.cc',
+        'browser/chromeos/audio/audio_devices_pref_handler_impl.h',
+        'browser/chromeos/background/ash_user_wallpaper_delegate.cc',
+        'browser/chromeos/background/ash_user_wallpaper_delegate.h',
+        'browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc',
+        'browser/chromeos/bluetooth/bluetooth_pairing_dialog.h',
+        'browser/chromeos/boot_times_loader.cc',
+        'browser/chromeos/boot_times_loader.h',
+        'browser/chromeos/camera_detector.cc',
+        'browser/chromeos/camera_detector.h',
+        'browser/chromeos/choose_mobile_network_dialog.cc',
+        'browser/chromeos/choose_mobile_network_dialog.h',
+        'browser/chromeos/chrome_browser_main_chromeos.cc',
+        'browser/chromeos/chrome_browser_main_chromeos.h',
+        'browser/chromeos/contacts/contact_database.cc',
+        'browser/chromeos/contacts/contact_database.h',
+        'browser/chromeos/contacts/contact_manager.cc',
+        'browser/chromeos/contacts/contact_manager.h',
+        'browser/chromeos/contacts/contact_manager_observer.h',
+        'browser/chromeos/contacts/contact_map.cc',
+        'browser/chromeos/contacts/contact_map.h',
+        'browser/chromeos/contacts/contact_store.h',
+        'browser/chromeos/contacts/contact_store_observer.h',
+        'browser/chromeos/contacts/gdata_contacts_service.cc',
+        'browser/chromeos/contacts/gdata_contacts_service.h',
+        'browser/chromeos/contacts/google_contact_store.cc',
+        'browser/chromeos/contacts/google_contact_store.h',
+        'browser/chromeos/cros/cert_library.cc',
+        'browser/chromeos/cros/cert_library.h',
+        'browser/chromeos/cros/enum_mapper.h',
+        'browser/chromeos/cros/native_network_constants.cc',
+        'browser/chromeos/cros/native_network_constants.h',
+        'browser/chromeos/cros/native_network_parser.cc',
+        'browser/chromeos/cros/native_network_parser.h',
+        'browser/chromeos/cros/network_constants.h',
+        'browser/chromeos/cros/network_library.cc',
+        'browser/chromeos/cros/network_library.h',
+        'browser/chromeos/cros/network_library_impl_base.cc',
+        'browser/chromeos/cros/network_library_impl_base.h',
+        'browser/chromeos/cros/network_library_impl_cros.cc',
+        'browser/chromeos/cros/network_library_impl_cros.h',
+        'browser/chromeos/cros/network_library_impl_stub.cc',
+        'browser/chromeos/cros/network_library_impl_stub.h',
+        'browser/chromeos/cros/network_parser.cc',
+        'browser/chromeos/cros/network_parser.h',
+        'browser/chromeos/cros/network_property_ui_data.cc',
+        'browser/chromeos/cros/network_property_ui_data.h',
+        'browser/chromeos/customization_document.cc',
+        'browser/chromeos/customization_document.h',
+        'browser/chromeos/display/display_configuration_observer.cc',
+        'browser/chromeos/display/display_configuration_observer.h',
+        'browser/chromeos/display/display_preferences.cc',
+        'browser/chromeos/display/display_preferences.h',
+        'browser/chromeos/display/overscan_calibrator.cc',
+        'browser/chromeos/display/overscan_calibrator.h',
+        'browser/chromeos/dbus/cros_dbus_service.cc',
+        'browser/chromeos/dbus/cros_dbus_service.h',
+        'browser/chromeos/dbus/display_power_service_provider.cc',
+        'browser/chromeos/dbus/display_power_service_provider.h',
+        'browser/chromeos/dbus/liveness_service_provider.cc',
+        'browser/chromeos/dbus/liveness_service_provider.h',
+        'browser/chromeos/dbus/printer_service_provider.cc',
+        'browser/chromeos/dbus/printer_service_provider.h',
+        'browser/chromeos/dbus/proxy_resolution_service_provider.cc',
+        'browser/chromeos/dbus/proxy_resolution_service_provider.h',
+        'browser/chromeos/device_hierarchy_observer.h',
+        'browser/chromeos/device_uma.cc',
+        'browser/chromeos/device_uma.h',
+        'browser/chromeos/drive/async_file_util.cc',
+        'browser/chromeos/drive/async_file_util.h',
+        'browser/chromeos/drive/change_list_loader.cc',
+        'browser/chromeos/drive/change_list_loader.h',
+        'browser/chromeos/drive/change_list_loader_observer.h',
+        'browser/chromeos/drive/change_list_processor.cc',
+        'browser/chromeos/drive/change_list_processor.h',
+        'browser/chromeos/drive/debug_info_collector.cc',
+        'browser/chromeos/drive/debug_info_collector.h',
+        'browser/chromeos/drive/download_handler.cc',
+        'browser/chromeos/drive/download_handler.h',
+        'browser/chromeos/drive/drive_app_registry.cc',
+        'browser/chromeos/drive/drive_app_registry.h',
+        'browser/chromeos/drive/drive_file_stream_reader.cc',
+        'browser/chromeos/drive/drive_file_stream_reader.h',
+        'browser/chromeos/drive/drive_integration_service.cc',
+        'browser/chromeos/drive/drive_integration_service.h',
+        'browser/chromeos/drive/drive_protocol_handler.cc',
+        'browser/chromeos/drive/drive_protocol_handler.h',
+        'browser/chromeos/drive/drive_url_request_job.cc',
+        'browser/chromeos/drive/drive_url_request_job.h',
+        'browser/chromeos/drive/file_cache.cc',
+        'browser/chromeos/drive/file_cache.h',
+        'browser/chromeos/drive/file_cache_metadata.cc',
+        'browser/chromeos/drive/file_cache_metadata.h',
+        'browser/chromeos/drive/file_change.cc',
+        'browser/chromeos/drive/file_change.h',
+        'browser/chromeos/drive/file_errors.cc',
+        'browser/chromeos/drive/file_errors.h',
+        'browser/chromeos/drive/file_system.cc',
+        'browser/chromeos/drive/file_system.h',
+        'browser/chromeos/drive/file_system/copy_operation.cc',
+        'browser/chromeos/drive/file_system/copy_operation.h',
+        'browser/chromeos/drive/file_system/create_directory_operation.cc',
+        'browser/chromeos/drive/file_system/create_directory_operation.h',
+        'browser/chromeos/drive/file_system/create_file_operation.cc',
+        'browser/chromeos/drive/file_system/create_file_operation.h',
+        'browser/chromeos/drive/file_system/download_operation.cc',
+        'browser/chromeos/drive/file_system/download_operation.h',
+        'browser/chromeos/drive/file_system/get_file_for_saving_operation.cc',
+        'browser/chromeos/drive/file_system/get_file_for_saving_operation.h',
+        'browser/chromeos/drive/file_system/move_operation.cc',
+        'browser/chromeos/drive/file_system/move_operation.h',
+        'browser/chromeos/drive/file_system/open_file_operation.cc',
+        'browser/chromeos/drive/file_system/open_file_operation.h',
+        'browser/chromeos/drive/file_system/operation_observer.h',
+        'browser/chromeos/drive/file_system/remove_operation.cc',
+        'browser/chromeos/drive/file_system/remove_operation.h',
+        'browser/chromeos/drive/file_system/search_operation.cc',
+        'browser/chromeos/drive/file_system/search_operation.h',
+        'browser/chromeos/drive/file_system/touch_operation.cc',
+        'browser/chromeos/drive/file_system/touch_operation.h',
+        'browser/chromeos/drive/file_system/truncate_operation.cc',
+        'browser/chromeos/drive/file_system/truncate_operation.h',
+        'browser/chromeos/drive/file_system/update_operation.cc',
+        'browser/chromeos/drive/file_system/update_operation.h',
+        'browser/chromeos/drive/file_system_backend_delegate.cc',
+        'browser/chromeos/drive/file_system_backend_delegate.h',
+        'browser/chromeos/drive/file_system_interface.h',
+        'browser/chromeos/drive/file_system_metadata.cc',
+        'browser/chromeos/drive/file_system_metadata.h',
+        'browser/chromeos/drive/file_system_observer.h',
+        'browser/chromeos/drive/file_system_util.cc',
+        'browser/chromeos/drive/file_system_util.h',
+        'browser/chromeos/drive/file_task_executor.cc',
+        'browser/chromeos/drive/file_task_executor.h',
+        'browser/chromeos/drive/file_write_helper.cc',
+        'browser/chromeos/drive/file_write_helper.h',
+        'browser/chromeos/drive/file_write_watcher.cc',
+        'browser/chromeos/drive/file_write_watcher.h',
+        'browser/chromeos/drive/fileapi_worker.cc',
+        'browser/chromeos/drive/fileapi_worker.h',
+        'browser/chromeos/drive/job_list.cc',
+        'browser/chromeos/drive/job_list.h',
+        'browser/chromeos/drive/job_queue.cc',
+        'browser/chromeos/drive/job_queue.h',
+        'browser/chromeos/drive/job_scheduler.cc',
+        'browser/chromeos/drive/job_scheduler.h',
+        'browser/chromeos/drive/local_file_reader.cc',
+        'browser/chromeos/drive/local_file_reader.h',
+        'browser/chromeos/drive/logging.cc',
+        'browser/chromeos/drive/logging.h',
+        'browser/chromeos/drive/remove_stale_cache_files.cc',
+        'browser/chromeos/drive/remove_stale_cache_files.h',
+        'browser/chromeos/drive/resource_entry_conversion.cc',
+        'browser/chromeos/drive/resource_entry_conversion.h',
+        'browser/chromeos/drive/resource_metadata.cc',
+        'browser/chromeos/drive/resource_metadata.h',
+        'browser/chromeos/drive/resource_metadata_storage.cc',
+        'browser/chromeos/drive/resource_metadata_storage.h',
+        'browser/chromeos/drive/search_metadata.cc',
+        'browser/chromeos/drive/search_metadata.h',
+        'browser/chromeos/drive/sync_client.cc',
+        'browser/chromeos/drive/sync_client.h',
+        'browser/chromeos/drive/webkit_file_stream_reader_impl.cc',
+        'browser/chromeos/drive/webkit_file_stream_reader_impl.h',
+        'browser/chromeos/drive/webkit_file_stream_writer_impl.cc',
+        'browser/chromeos/drive/webkit_file_stream_writer_impl.h',
+        'browser/chromeos/enrollment_dialog_view.cc',
+        'browser/chromeos/enrollment_dialog_view.h',
+        'browser/chromeos/enterprise_extension_observer.cc',
+        'browser/chromeos/enterprise_extension_observer.h',
+        'browser/chromeos/extensions/default_app_order.cc',
+        'browser/chromeos/extensions/default_app_order.h',
+        'browser/chromeos/extensions/echo_private_api.cc',
+        'browser/chromeos/extensions/echo_private_api.h',
+        'browser/chromeos/extensions/external_cache.cc',
+        'browser/chromeos/extensions/external_cache.h',
+        'browser/chromeos/extensions/external_pref_cache_loader.cc',
+        'browser/chromeos/extensions/external_pref_cache_loader.h',
+        'browser/chromeos/extensions/file_manager/app_id.h',
+        'browser/chromeos/extensions/file_manager/desktop_notifications.cc',
+        'browser/chromeos/extensions/file_manager/desktop_notifications.h',
+        'browser/chromeos/extensions/file_manager/event_router.cc',
+        'browser/chromeos/extensions/file_manager/event_router.h',
+        'browser/chromeos/extensions/file_manager/file_browser_handlers.cc',
+        'browser/chromeos/extensions/file_manager/file_browser_handlers.h',
+        'browser/chromeos/extensions/file_manager/file_manager_util.cc',
+        'browser/chromeos/extensions/file_manager/file_manager_util.h',
+        'browser/chromeos/extensions/file_manager/file_tasks.cc',
+        'browser/chromeos/extensions/file_manager/file_tasks.h',
+        'browser/chromeos/extensions/file_manager/file_watcher.cc',
+        'browser/chromeos/extensions/file_manager/file_watcher.h',
+        'browser/chromeos/extensions/file_manager/fileapi_util.cc',
+        'browser/chromeos/extensions/file_manager/fileapi_util.h',
+        'browser/chromeos/extensions/file_manager/mounted_disk_monitor.cc',
+        'browser/chromeos/extensions/file_manager/mounted_disk_monitor.h',
+        'browser/chromeos/extensions/file_manager/url_util.cc',
+        'browser/chromeos/extensions/file_manager/url_util.h',
+        'browser/chromeos/extensions/file_manager/zip_file_creator.cc',
+        'browser/chromeos/extensions/file_manager/zip_file_creator.h',
+        'browser/chromeos/extensions/info_private_api.cc',
+        'browser/chromeos/extensions/info_private_api.h',
+        'browser/chromeos/extensions/input_method_event_router.cc',
+        'browser/chromeos/extensions/input_method_event_router.h',
+        'browser/chromeos/extensions/install_limiter.cc',
+        'browser/chromeos/extensions/install_limiter.h',
+        'browser/chromeos/extensions/install_limiter_factory.cc',
+        'browser/chromeos/extensions/install_limiter_factory.h',
+        'browser/chromeos/extensions/media_player_event_router.cc',
+        'browser/chromeos/extensions/media_player_event_router.h',
+        'browser/chromeos/external_metrics.cc',
+        'browser/chromeos/external_metrics.h',
+        'browser/chromeos/external_protocol_dialog.cc',
+        'browser/chromeos/external_protocol_dialog.h',
+        'browser/chromeos/fileapi/file_access_permissions.cc',
+        'browser/chromeos/fileapi/file_access_permissions.h',
+        'browser/chromeos/fileapi/file_system_backend.cc',
+        'browser/chromeos/fileapi/file_system_backend.h',
+        'browser/chromeos/fileapi/file_system_backend_delegate.h',
+        'browser/chromeos/imageburner/burn_controller.cc',
+        'browser/chromeos/imageburner/burn_controller.h',
+        'browser/chromeos/imageburner/burn_device_handler.cc',
+        'browser/chromeos/imageburner/burn_device_handler.h',
+        'browser/chromeos/imageburner/burn_manager.cc',
+        'browser/chromeos/imageburner/burn_manager.h',
+        'browser/chromeos/input_method/browser_state_monitor.cc',
+        'browser/chromeos/input_method/browser_state_monitor.h',
+        'browser/chromeos/input_method/candidate_window_controller.cc',
+        'browser/chromeos/input_method/candidate_window_controller.h',
+        'browser/chromeos/input_method/candidate_window_controller_impl.cc',
+        'browser/chromeos/input_method/candidate_window_controller_impl.h',
+        'browser/chromeos/input_method/candidate_window_view.cc',
+        'browser/chromeos/input_method/candidate_window_view.h',
+        'browser/chromeos/input_method/delayable_widget.cc',
+        'browser/chromeos/input_method/delayable_widget.h',
+        'browser/chromeos/input_method/hidable_area.cc',
+        'browser/chromeos/input_method/hidable_area.h',
+        'browser/chromeos/input_method/ibus_controller.cc',
+        'browser/chromeos/input_method/ibus_controller.h',
+        'browser/chromeos/input_method/ibus_controller_base.cc',
+        'browser/chromeos/input_method/ibus_controller_base.h',
+        'browser/chromeos/input_method/ibus_controller_impl.cc',
+        'browser/chromeos/input_method/ibus_controller_impl.h',
+        'browser/chromeos/input_method/infolist_window_view.cc',
+        'browser/chromeos/input_method/infolist_window_view.h',
+        'browser/chromeos/input_method/input_method_engine_ibus.cc',
+        'browser/chromeos/input_method/input_method_engine_ibus.h',
+        'browser/chromeos/input_method/input_method_configuration.cc',
+        'browser/chromeos/input_method/input_method_configuration.h',
+        'browser/chromeos/input_method/input_method_delegate_impl.cc',
+        'browser/chromeos/input_method/input_method_delegate_impl.h',
+        'browser/chromeos/input_method/input_method_engine.cc',
+        'browser/chromeos/input_method/input_method_engine.h',
+        'browser/chromeos/input_method/input_method_manager_impl.cc',
+        'browser/chromeos/input_method/input_method_manager_impl.h',
+        'browser/chromeos/input_method/input_method_manager_impl_ll.cc',
+        'browser/chromeos/input_method/input_method_manager_impl_ll.h',
+        'browser/chromeos/input_method/input_method_persistence.cc',
+        'browser/chromeos/input_method/input_method_persistence.h',
+        'browser/chromeos/input_method/input_method_util.cc',
+        'browser/chromeos/input_method/input_method_util.h',
+        'browser/chromeos/input_method/component_extension_ime_manager_impl.cc',
+        'browser/chromeos/input_method/component_extension_ime_manager_impl.h',
+        'browser/chromeos/input_method/mock_ibus_controller.cc',
+        'browser/chromeos/input_method/mock_ibus_controller.h',
+        'browser/chromeos/keyboard_driven_event_rewriter.cc',
+        'browser/chromeos/keyboard_driven_event_rewriter.h',
+        'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc',
+        'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h',
+        'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc',
+        'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h',
+        'browser/chromeos/kiosk_mode/kiosk_mode_settings.cc',
+        'browser/chromeos/kiosk_mode/kiosk_mode_settings.h',
+        'browser/chromeos/language_preferences.cc',
+        'browser/chromeos/language_preferences.h',
+        'browser/chromeos/locale_change_guard.cc',
+        'browser/chromeos/locale_change_guard.h',
+        'browser/chromeos/login/auth_attempt_state.cc',
+        'browser/chromeos/login/auth_attempt_state.h',
+        'browser/chromeos/login/auth_attempt_state_resolver.cc',
+        'browser/chromeos/login/auth_attempt_state_resolver.h',
+        'browser/chromeos/login/auth_prewarmer.cc',
+        'browser/chromeos/login/auth_prewarmer.h',
+        'browser/chromeos/login/authentication_notification_details.h',
+        'browser/chromeos/login/authenticator.cc',
+        'browser/chromeos/login/authenticator.h',
+        'browser/chromeos/login/captive_portal_view.cc',
+        'browser/chromeos/login/captive_portal_view.h',
+        'browser/chromeos/login/captive_portal_window_proxy.cc',
+        'browser/chromeos/login/captive_portal_window_proxy.h',
+        'browser/chromeos/login/chrome_restart_request.cc',
+        'browser/chromeos/login/chrome_restart_request.h',
+        'browser/chromeos/login/default_pinned_apps_field_trial.cc',
+        'browser/chromeos/login/default_pinned_apps_field_trial.h',
+        'browser/chromeos/login/default_user_images.cc',
+        'browser/chromeos/login/default_user_images.h',
+        'browser/chromeos/login/enrollment/enrollment_screen.cc',
+        'browser/chromeos/login/enrollment/enrollment_screen.h',
+        'browser/chromeos/login/enrollment/enrollment_screen_actor.h',
+        'browser/chromeos/login/existing_user_controller.cc',
+        'browser/chromeos/login/existing_user_controller.h',
+        'browser/chromeos/login/help_app_launcher.cc',
+        'browser/chromeos/login/help_app_launcher.h',
+        'browser/chromeos/login/helper.cc',
+        'browser/chromeos/login/helper.h',
+        'browser/chromeos/login/hwid_checker.cc',
+        'browser/chromeos/login/hwid_checker.h',
+        'browser/chromeos/login/language_list.cc',
+        'browser/chromeos/login/language_list.h',
+        'browser/chromeos/login/language_switch_menu.cc',
+        'browser/chromeos/login/language_switch_menu.h',
+        'browser/chromeos/login/lock_window.cc',
+        'browser/chromeos/login/lock_window.h',
+        'browser/chromeos/login/lock_window_aura.cc',
+        'browser/chromeos/login/lock_window_aura.h',
+        'browser/chromeos/login/login_display.cc',
+        'browser/chromeos/login/login_display.h',
+        'browser/chromeos/login/login_display_host.h',
+        'browser/chromeos/login/login_display_host_impl.cc',
+        'browser/chromeos/login/login_display_host_impl.h',
+        'browser/chromeos/login/login_performer.cc',
+        'browser/chromeos/login/login_performer.h',
+        'browser/chromeos/login/login_status_consumer.cc',
+        'browser/chromeos/login/login_status_consumer.h',
+        'browser/chromeos/login/login_utils.cc',
+        'browser/chromeos/login/login_utils.h',
+        'browser/chromeos/login/login_web_dialog.cc',
+        'browser/chromeos/login/login_web_dialog.h',
+        'browser/chromeos/login/login_wizard.h',
+        'browser/chromeos/login/managed/locally_managed_user_constants.cc',
+        'browser/chromeos/login/managed/locally_managed_user_constants.h',
+        'browser/chromeos/login/managed/locally_managed_user_creation_controller.cc',
+        'browser/chromeos/login/managed/locally_managed_user_creation_controller.h',
+        'browser/chromeos/login/managed/locally_managed_user_creation_flow.cc',
+        'browser/chromeos/login/managed/locally_managed_user_creation_flow.h',
+        'browser/chromeos/login/managed/locally_managed_user_creation_screen.cc',
+        'browser/chromeos/login/managed/locally_managed_user_creation_screen.h',
+        'browser/chromeos/login/managed/locally_managed_user_login_flow.cc',
+        'browser/chromeos/login/managed/locally_managed_user_login_flow.h',
+        'browser/chromeos/login/managed/managed_user_authenticator.cc',
+        'browser/chromeos/login/managed/managed_user_authenticator.h',
+        'browser/chromeos/login/merge_session_load_page.cc',
+        'browser/chromeos/login/merge_session_load_page.h',
+        'browser/chromeos/login/merge_session_throttle.cc',
+        'browser/chromeos/login/merge_session_throttle.h',
+        'browser/chromeos/login/mount_manager.cc',
+        'browser/chromeos/login/mount_manager.h',
+        'browser/chromeos/login/oauth2_login_manager.cc',
+        'browser/chromeos/login/oauth2_login_manager.h',
+        'browser/chromeos/login/oauth_login_manager.cc',
+        'browser/chromeos/login/oauth_login_manager.h',
+        'browser/chromeos/login/oauth2_login_verifier.cc',
+        'browser/chromeos/login/oauth2_login_verifier.h',
+        'browser/chromeos/login/oauth2_token_fetcher.cc',
+        'browser/chromeos/login/oauth2_token_fetcher.h',
+        'browser/chromeos/login/online_attempt.cc',
+        'browser/chromeos/login/online_attempt.h',
+        'browser/chromeos/login/online_attempt_host.cc',
+        'browser/chromeos/login/online_attempt_host.h',
+        'browser/chromeos/login/oobe_display.h',
+        'browser/chromeos/login/parallel_authenticator.cc',
+        'browser/chromeos/login/parallel_authenticator.h',
+        'browser/chromeos/login/profile_auth_data.cc',
+        'browser/chromeos/login/profile_auth_data.h',
+        'browser/chromeos/login/proxy_settings_dialog.cc',
+        'browser/chromeos/login/proxy_settings_dialog.h',
+        'browser/chromeos/login/remove_user_delegate.h',
+        'browser/chromeos/login/screen_locker.cc',
+        'browser/chromeos/login/screen_locker.h',
+        'browser/chromeos/login/screen_locker_delegate.cc',
+        'browser/chromeos/login/screen_locker_delegate.h',
+        'browser/chromeos/login/screens/base_screen.cc',
+        'browser/chromeos/login/screens/base_screen.h',
+        'browser/chromeos/login/screens/core_oobe_actor.h',
+        'browser/chromeos/login/screens/error_screen.cc',
+        'browser/chromeos/login/screens/error_screen.h',
+        'browser/chromeos/login/screens/error_screen_actor.cc',
+        'browser/chromeos/login/screens/error_screen_actor.h',
+        'browser/chromeos/login/screens/eula_screen.cc',
+        'browser/chromeos/login/screens/eula_screen.h',
+        'browser/chromeos/login/screens/eula_screen_actor.h',
+        'browser/chromeos/login/screens/kiosk_autolaunch_screen.cc',
+        'browser/chromeos/login/screens/kiosk_autolaunch_screen.h',
+        'browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h',
+        'browser/chromeos/login/screens/kiosk_enable_screen.cc',
+        'browser/chromeos/login/screens/kiosk_enable_screen.h',
+        'browser/chromeos/login/screens/kiosk_enable_screen_actor.h',
+        'browser/chromeos/login/screens/network_screen.cc',
+        'browser/chromeos/login/screens/network_screen.h',
+        'browser/chromeos/login/screens/network_screen_actor.h',
+        'browser/chromeos/login/screens/reset_screen.cc',
+        'browser/chromeos/login/screens/reset_screen.h',
+        'browser/chromeos/login/screens/reset_screen_actor.h',
+        'browser/chromeos/login/screens/screen_context.cc',
+        'browser/chromeos/login/screens/screen_context.h',
+        'browser/chromeos/login/screens/screen_factory.cc',
+        'browser/chromeos/login/screens/screen_factory.h',
+        'browser/chromeos/login/screens/screen_flow.h',
+        'browser/chromeos/login/screens/screen_manager.cc',
+        'browser/chromeos/login/screens/screen_manager.h',
+        'browser/chromeos/login/screens/screen_observer.h',
+        'browser/chromeos/login/screens/terms_of_service_screen.cc',
+        'browser/chromeos/login/screens/terms_of_service_screen.h',
+        'browser/chromeos/login/screens/terms_of_service_screen_actor.h',
+        'browser/chromeos/login/screens/update_screen.cc',
+        'browser/chromeos/login/screens/update_screen.h',
+        'browser/chromeos/login/screens/update_screen_actor.h',
+        'browser/chromeos/login/screens/user_image_screen.cc',
+        'browser/chromeos/login/screens/user_image_screen.h',
+        'browser/chromeos/login/screens/user_image_screen_actor.h',
+        'browser/chromeos/login/screens/wizard_screen.cc',
+        'browser/chromeos/login/screens/wizard_screen.h',
+        'browser/chromeos/login/screens/wrong_hwid_screen.cc',
+        'browser/chromeos/login/screens/wrong_hwid_screen.h',
+        'browser/chromeos/login/screens/wrong_hwid_screen_actor.h',
+        'browser/chromeos/login/simple_web_view_dialog.cc',
+        'browser/chromeos/login/simple_web_view_dialog.h',
+        'browser/chromeos/login/startup_utils.cc',
+        'browser/chromeos/login/startup_utils.h',
+        'browser/chromeos/login/test_attempt_state.cc',
+        'browser/chromeos/login/test_attempt_state.h',
+        'browser/chromeos/login/tpm_password_fetcher.cc',
+        'browser/chromeos/login/tpm_password_fetcher.h',
+        'browser/chromeos/login/user.cc',
+        'browser/chromeos/login/user.h',
+        'browser/chromeos/login/user_adding_screen.cc',
+        'browser/chromeos/login/user_adding_screen.h',
+        'browser/chromeos/login/user_image.cc',
+        'browser/chromeos/login/user_image.h',
+        'browser/chromeos/login/user_image_loader.cc',
+        'browser/chromeos/login/user_image_loader.h',
+        'browser/chromeos/login/user_image_manager.h',
+        'browser/chromeos/login/user_image_manager.cc',
+        'browser/chromeos/login/user_image_manager_impl.cc',
+        'browser/chromeos/login/user_image_manager_impl.h',
+        'browser/chromeos/login/user_image_sync_observer.cc',
+        'browser/chromeos/login/user_image_sync_observer.h',
+        'browser/chromeos/login/user_flow.cc',
+        'browser/chromeos/login/user_flow.h',
+        'browser/chromeos/login/user_manager.cc',
+        'browser/chromeos/login/user_manager.h',
+        'browser/chromeos/login/user_manager_impl.cc',
+        'browser/chromeos/login/user_manager_impl.h',
+        'browser/chromeos/login/version_info_updater.cc',
+        'browser/chromeos/login/version_info_updater.h',
+        'browser/chromeos/login/wallpaper_manager.cc',
+        'browser/chromeos/login/wallpaper_manager.h',
+        'browser/chromeos/login/webui_login_display.cc',
+        'browser/chromeos/login/webui_login_display.h',
+        'browser/chromeos/login/webui_login_view.cc',
+        'browser/chromeos/login/webui_login_view.h',
+        'browser/chromeos/login/webui_screen_locker.cc',
+        'browser/chromeos/login/webui_screen_locker.h',
+        'browser/chromeos/login/wizard_controller.cc',
+        'browser/chromeos/login/wizard_controller.h',
+        'browser/chromeos/media/media_player.cc',
+        'browser/chromeos/media/media_player.h',
+        'browser/chromeos/memory/oom_priority_manager.cc',
+        'browser/chromeos/memory/oom_priority_manager.h',
+        'browser/chromeos/mobile/mobile_activator.cc',
+        'browser/chromeos/mobile/mobile_activator.h',
+        'browser/chromeos/mobile_config.cc',
+        'browser/chromeos/mobile_config.h',
+        'browser/chromeos/net/network_portal_detector.cc',
+        'browser/chromeos/net/network_portal_detector.h',
+        'browser/chromeos/net/network_portal_detector_impl.cc',
+        'browser/chromeos/net/network_portal_detector_impl.h',
+        'browser/chromeos/net/network_portal_detector_stub.cc',
+        'browser/chromeos/net/network_portal_detector_stub.h',
+        'browser/chromeos/net/onc_utils.cc',
+        'browser/chromeos/net/onc_utils.h',
+        'browser/chromeos/net/proxy_config_handler.cc',
+        'browser/chromeos/net/proxy_config_handler.h',
+        'browser/chromeos/notifications/balloon_view_host_chromeos.cc',
+        'browser/chromeos/notifications/balloon_view_host_chromeos.h',
+        'browser/chromeos/offline/offline_load_page.cc',
+        'browser/chromeos/offline/offline_load_page.h',
+        'browser/chromeos/options/network_config_view.cc',
+        'browser/chromeos/options/network_config_view.h',
+        'browser/chromeos/options/network_connect.cc',
+        'browser/chromeos/options/network_connect.h',
+        'browser/chromeos/options/passphrase_textfield.cc',
+        'browser/chromeos/options/passphrase_textfield.h',
+        'browser/chromeos/options/vpn_config_view.cc',
+        'browser/chromeos/options/vpn_config_view.h',
+        'browser/chromeos/options/wifi_config_view.cc',
+        'browser/chromeos/options/wifi_config_view.h',
+        'browser/chromeos/options/wimax_config_view.cc',
+        'browser/chromeos/options/wimax_config_view.h',
+        'browser/chromeos/policy/app_pack_updater.cc',
+        'browser/chromeos/policy/app_pack_updater.h',
+        'browser/chromeos/policy/auto_enrollment_client.cc',
+        'browser/chromeos/policy/auto_enrollment_client.h',
+        'browser/chromeos/policy/configuration_policy_handler_chromeos.cc',
+        'browser/chromeos/policy/configuration_policy_handler_chromeos.h',
+        'browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc',
+        'browser/chromeos/policy/device_cloud_policy_manager_chromeos.h',
+        'browser/chromeos/policy/device_cloud_policy_store_chromeos.cc',
+        'browser/chromeos/policy/device_cloud_policy_store_chromeos.h',
+        'browser/chromeos/policy/device_cloud_policy_validator.cc',
+        'browser/chromeos/policy/device_cloud_policy_validator.h',
+        'browser/chromeos/policy/device_local_account.cc',
+        'browser/chromeos/policy/device_local_account.h',
+        'browser/chromeos/policy/device_local_account_policy_provider.cc',
+        'browser/chromeos/policy/device_local_account_policy_provider.h',
+        'browser/chromeos/policy/device_local_account_policy_service.cc',
+        'browser/chromeos/policy/device_local_account_policy_service.h',
+        'browser/chromeos/policy/device_local_account_policy_store.cc',
+        'browser/chromeos/policy/device_local_account_policy_store.h',
+        'browser/chromeos/policy/device_policy_decoder_chromeos.cc',
+        'browser/chromeos/policy/device_policy_decoder_chromeos.h',
+        'browser/chromeos/policy/device_status_collector.cc',
+        'browser/chromeos/policy/device_status_collector.h',
+        'browser/chromeos/policy/enrollment_handler_chromeos.cc',
+        'browser/chromeos/policy/enrollment_handler_chromeos.h',
+        'browser/chromeos/policy/enrollment_status_chromeos.cc',
+        'browser/chromeos/policy/enrollment_status_chromeos.h',
+        'browser/chromeos/policy/enterprise_install_attributes.cc',
+        'browser/chromeos/policy/enterprise_install_attributes.h',
+        'browser/chromeos/policy/login_profile_policy_provider.cc',
+        'browser/chromeos/policy/login_profile_policy_provider.h',
+        'browser/chromeos/policy/login_screen_power_management_policy.cc',
+        'browser/chromeos/policy/login_screen_power_management_policy.h',
+        'browser/chromeos/policy/network_configuration_updater.cc',
+        'browser/chromeos/policy/network_configuration_updater.h',
+        'browser/chromeos/policy/network_configuration_updater_impl.cc',
+        'browser/chromeos/policy/network_configuration_updater_impl.h',
+        'browser/chromeos/policy/network_configuration_updater_impl_cros.cc',
+        'browser/chromeos/policy/network_configuration_updater_impl_cros.h',
+        'browser/chromeos/policy/policy_cert_verifier.cc',
+        'browser/chromeos/policy/policy_cert_verifier.h',
+        'browser/chromeos/policy/policy_oauth2_token_fetcher.cc',
+        'browser/chromeos/policy/policy_oauth2_token_fetcher.h',
+        'browser/chromeos/policy/proxy_policy_provider.cc',
+        'browser/chromeos/policy/proxy_policy_provider.h',
+        'browser/chromeos/policy/recommendation_restorer.cc',
+        'browser/chromeos/policy/recommendation_restorer.h',
+        'browser/chromeos/policy/recommendation_restorer_factory.cc',
+        'browser/chromeos/policy/recommendation_restorer_factory.h',
+        'browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc',
+        'browser/chromeos/policy/user_cloud_policy_manager_chromeos.h',
+        'browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc',
+        'browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h',
+        'browser/chromeos/policy/user_cloud_policy_store_chromeos.cc',
+        'browser/chromeos/policy/user_cloud_policy_store_chromeos.h',
+        'browser/chromeos/policy/user_cloud_policy_token_forwarder.cc',
+        'browser/chromeos/policy/user_cloud_policy_token_forwarder.h',
+        'browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc',
+        'browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h',
+        'browser/chromeos/policy/user_policy_disk_cache.cc',
+        'browser/chromeos/policy/user_policy_disk_cache.h',
+        'browser/chromeos/policy/user_policy_token_loader.cc',
+        'browser/chromeos/policy/user_policy_token_loader.h',
+        'browser/chromeos/power/brightness_observer.cc',
+        'browser/chromeos/power/brightness_observer.h',
+        'browser/chromeos/power/idle_action_warning_dialog_view.cc',
+        'browser/chromeos/power/idle_action_warning_dialog_view.h',
+        'browser/chromeos/power/idle_action_warning_observer.cc',
+        'browser/chromeos/power/idle_action_warning_observer.h',
+        'browser/chromeos/power/peripheral_battery_observer.cc',
+        'browser/chromeos/power/peripheral_battery_observer.h',
+        'browser/chromeos/power/power_button_observer.cc',
+        'browser/chromeos/power/power_button_observer.h',
+        'browser/chromeos/power/power_prefs.cc',
+        'browser/chromeos/power/power_prefs.h',
+        'browser/chromeos/power/resume_observer.cc',
+        'browser/chromeos/power/resume_observer.h',
+        'browser/chromeos/power/screen_lock_observer.cc',
+        'browser/chromeos/power/screen_lock_observer.h',
+        'browser/chromeos/power/session_state_controller_delegate_chromeos.cc',
+        'browser/chromeos/power/session_state_controller_delegate_chromeos.h',
+        'browser/chromeos/power/suspend_observer.cc',
+        'browser/chromeos/power/suspend_observer.h',
+        'browser/chromeos/power/user_activity_notifier.cc',
+        'browser/chromeos/power/user_activity_notifier.h',
+        'browser/chromeos/power/video_activity_notifier.cc',
+        'browser/chromeos/power/video_activity_notifier.h',
+        'browser/chromeos/preferences.cc',
+        'browser/chromeos/preferences.h',
+        'browser/chromeos/prerender_condition_network.cc',
+        'browser/chromeos/prerender_condition_network.h',
+        'browser/chromeos/profiles/profile_helper.cc',
+        'browser/chromeos/profiles/profile_helper.h',
+        'browser/chromeos/profiles/profile_util.cc',
+        'browser/chromeos/profiles/profile_util.h',
+        'browser/chromeos/proxy_config_service_impl.cc',
+        'browser/chromeos/proxy_config_service_impl.h',
+        'browser/chromeos/proxy_cros_settings_parser.cc',
+        'browser/chromeos/proxy_cros_settings_parser.h',
+        'browser/chromeos/screensaver/screensaver_controller.cc',
+        'browser/chromeos/screensaver/screensaver_controller.h',
+        'browser/chromeos/session_length_limiter.cc',
+        'browser/chromeos/session_length_limiter.h',
+        'browser/chromeos/settings/cros_settings.cc',
+        'browser/chromeos/settings/cros_settings.h',
+        'browser/chromeos/settings/cros_settings_names.cc',
+        'browser/chromeos/settings/cros_settings_names.h',
+        'browser/chromeos/settings/cros_settings_provider.cc',
+        'browser/chromeos/settings/cros_settings_provider.h',
+        'browser/chromeos/settings/device_oauth2_token_service.cc',
+        'browser/chromeos/settings/device_oauth2_token_service.h',
+        'browser/chromeos/settings/device_oauth2_token_service_factory.cc',
+        'browser/chromeos/settings/device_oauth2_token_service_factory.h',
+        'browser/chromeos/settings/device_settings_cache.cc',
+        'browser/chromeos/settings/device_settings_cache.h',
+        'browser/chromeos/settings/device_settings_provider.cc',
+        'browser/chromeos/settings/device_settings_provider.h',
+        'browser/chromeos/settings/device_settings_service.cc',
+        'browser/chromeos/settings/device_settings_service.h',
+        'browser/chromeos/settings/owner_flags_storage.cc',
+        'browser/chromeos/settings/owner_flags_storage.h',
+        'browser/chromeos/settings/owner_key_util.cc',
+        'browser/chromeos/settings/owner_key_util.h',
+        'browser/chromeos/settings/session_manager_operation.cc',
+        'browser/chromeos/settings/session_manager_operation.h',
+        'browser/chromeos/settings/stub_cros_settings_provider.cc',
+        'browser/chromeos/settings/stub_cros_settings_provider.h',
+        'browser/chromeos/settings/system_settings_provider.cc',
+        'browser/chromeos/settings/system_settings_provider.h',
+        'browser/chromeos/sim_dialog_delegate.cc',
+        'browser/chromeos/sim_dialog_delegate.h',
+        'browser/chromeos/status/data_promo_notification.cc',
+        'browser/chromeos/status/data_promo_notification.h',
+        'browser/chromeos/status/network_menu.cc',
+        'browser/chromeos/status/network_menu.h',
+        'browser/chromeos/swap_metrics.cc',
+        'browser/chromeos/swap_metrics.h',
+        'browser/chromeos/system/ash_system_tray_delegate.cc',
+        'browser/chromeos/system/ash_system_tray_delegate.h',
+        'browser/chromeos/system/automatic_reboot_manager.cc',
+        'browser/chromeos/system/automatic_reboot_manager.h',
+        'browser/chromeos/system/automatic_reboot_manager_observer.h',
+        'browser/chromeos/system/device_change_handler.cc',
+        'browser/chromeos/system/device_change_handler.h',
+        'browser/chromeos/system/input_device_settings.cc',
+        'browser/chromeos/system/input_device_settings.h',
+        'browser/chromeos/system/pointer_device_observer.cc',
+        'browser/chromeos/system/pointer_device_observer.h',
+        'browser/chromeos/system/statistics_provider.cc',
+        'browser/chromeos/system/statistics_provider.h',
+        'browser/chromeos/system/syslogs_provider.cc',
+        'browser/chromeos/system/syslogs_provider.h',
+        'browser/chromeos/system/timezone_settings.cc',
+        'browser/chromeos/system/timezone_settings.h',
+        'browser/chromeos/system_key_event_listener.cc',
+        'browser/chromeos/system_key_event_listener.h',
+        'browser/chromeos/system_logs/about_system_logs_fetcher.cc',
+        'browser/chromeos/system_logs/about_system_logs_fetcher.h',
+        'browser/chromeos/system_logs/chrome_internal_log_source.cc',
+        'browser/chromeos/system_logs/chrome_internal_log_source.h',
+        'browser/chromeos/system_logs/command_line_log_source.cc',
+        'browser/chromeos/system_logs/command_line_log_source.h',
+        'browser/chromeos/system_logs/dbus_log_source.cc',
+        'browser/chromeos/system_logs/dbus_log_source.h',
+        'browser/chromeos/system_logs/debug_daemon_log_source.cc',
+        'browser/chromeos/system_logs/debug_daemon_log_source.h',
+        'browser/chromeos/system_logs/lsb_release_log_source.cc',
+        'browser/chromeos/system_logs/lsb_release_log_source.h',
+        'browser/chromeos/system_logs/memory_details_log_source.cc',
+        'browser/chromeos/system_logs/memory_details_log_source.h',
+        'browser/chromeos/system_logs/network_event_log_source.cc',
+        'browser/chromeos/system_logs/network_event_log_source.h',
+        'browser/chromeos/system_logs/scrubbed_system_logs_fetcher.cc',
+        'browser/chromeos/system_logs/scrubbed_system_logs_fetcher.h',
+        'browser/chromeos/system_logs/system_logs_fetcher_base.cc',
+        'browser/chromeos/system_logs/system_logs_fetcher_base.h',
+        'browser/chromeos/system_logs/touch_log_source.cc',
+        'browser/chromeos/system_logs/touch_log_source.h',
+        'browser/chromeos/ui/app_launch_view.cc',
+        'browser/chromeos/ui/app_launch_view.h',
+        'browser/chromeos/ui/echo_dialog_listener.h',
+        'browser/chromeos/ui/echo_dialog_view.cc',
+        'browser/chromeos/ui/echo_dialog_view.h',
+        'browser/chromeos/ui/focus_ring_controller.cc',
+        'browser/chromeos/ui/focus_ring_controller.h',
+        'browser/chromeos/ui/focus_ring_layer.cc',
+        'browser/chromeos/ui/focus_ring_layer.h',
+        'browser/chromeos/ui/idle_logout_dialog_view.cc',
+        'browser/chromeos/ui/idle_logout_dialog_view.h',
+        'browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc',
+        'browser/chromeos/ui/screen_capture_notification_ui_chromeos.h',
+        'browser/chromeos/ui_proxy_config.cc',
+        'browser/chromeos/ui_proxy_config.h',
+        'browser/chromeos/ui_proxy_config_service.cc',
+        'browser/chromeos/ui_proxy_config_service.h',
+        'browser/chromeos/upgrade_detector_chromeos.cc',
+        'browser/chromeos/upgrade_detector_chromeos.h',
+        'browser/chromeos/version_loader.cc',
+        'browser/chromeos/version_loader.h',
+        'browser/chromeos/xinput_hierarchy_changed_event_listener.cc',
+        'browser/chromeos/xinput_hierarchy_changed_event_listener.h',
+        'browser/chromeos/xinput_hierarchy_changed_event_listener_aura.cc',
+      ],
+      'conditions': [
+        ['enable_extensions==1', {
+          'sources': [
+            # Only extension API implementations should go here.
+            'browser/chromeos/extensions/echo_private_api.cc',
+            'browser/chromeos/extensions/echo_private_api.h',
+            'browser/chromeos/extensions/file_manager/file_browser_handler_api.cc',
+            'browser/chromeos/extensions/file_manager/file_browser_handler_api.h',
+            'browser/chromeos/extensions/file_manager/file_browser_private_api.cc',
+            'browser/chromeos/extensions/file_manager/file_browser_private_api.h',
+            'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc',
+            'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h',
+            'browser/chromeos/extensions/file_manager/private_api_base.cc',
+            'browser/chromeos/extensions/file_manager/private_api_base.h',
+            'browser/chromeos/extensions/file_manager/private_api_dialog.cc',
+            'browser/chromeos/extensions/file_manager/private_api_dialog.h',
+            'browser/chromeos/extensions/file_manager/private_api_drive.cc',
+            'browser/chromeos/extensions/file_manager/private_api_drive.h',
+            'browser/chromeos/extensions/file_manager/private_api_file_system.cc',
+            'browser/chromeos/extensions/file_manager/private_api_file_system.h',
+            'browser/chromeos/extensions/file_manager/private_api_misc.cc',
+            'browser/chromeos/extensions/file_manager/private_api_misc.h',
+            'browser/chromeos/extensions/file_manager/private_api_mount.cc',
+            'browser/chromeos/extensions/file_manager/private_api_mount.h',
+            'browser/chromeos/extensions/file_manager/private_api_strings.cc',
+            'browser/chromeos/extensions/file_manager/private_api_strings.h',
+            'browser/chromeos/extensions/file_manager/private_api_tasks.cc',
+            'browser/chromeos/extensions/file_manager/private_api_tasks.h',
+            'browser/chromeos/extensions/file_manager/private_api_util.cc',
+            'browser/chromeos/extensions/file_manager/private_api_util.h',
+            'browser/chromeos/extensions/input_method_api.cc',
+            'browser/chromeos/extensions/input_method_api.h',
+            'browser/chromeos/extensions/media_player_api.cc',
+            'browser/chromeos/extensions/media_player_api.h',
+            'browser/chromeos/extensions/wallpaper_manager_util.cc',
+            'browser/chromeos/extensions/wallpaper_manager_util.h',
+            'browser/chromeos/extensions/wallpaper_private_api.cc',
+            'browser/chromeos/extensions/wallpaper_private_api.h',
+          ],
+        }],
+        ['use_x11==0', {
+          'sources!': [
+            'browser/chromeos/device_uma.cc',
+            'browser/chromeos/device_uma.h',
+          ],
+        }],
+        ['use_cras==1', {
+          'defines': [
+            'USE_CRAS',
+          ],          
+        }],
+        ['file_manager_extension==0', {
+          'sources/': [
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.cc'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.h'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api.cc'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api.h'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_manager_util.cc'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_manager_util.h'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_tasks.cc'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/file_tasks.h'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/zip_file_creator.cc'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/zip_file_creator.h'],
+            ['exclude', 'browser/chromeos/extensions/media_player_api.cc'],
+            ['exclude', 'browser/chromeos/extensions/media_player_api.h'],
+          ],
+        }],
+        ['use_ash==1', {
+          'dependencies': [
+            '../ash/ash.gyp:ash',
+            '../ash/ash.gyp:ash_resources',
+            '../ash/ash_strings.gyp:ash_strings',
+            '../ui/app_list/app_list.gyp:app_list',
+            '../ui/message_center/message_center.gyp:message_center',
+          ],
+        }],
+        ['use_aura==1', {
+          'dependencies': [
+            '../ui/aura/aura.gyp:aura',
+            '../ui/compositor/compositor.gyp:compositor',
+          ],
+        }],
+        ['ui_compositor_image_transport==1', {
+          'dependencies': [
+            '../ui/gl/gl.gyp:gl',
+          ],
+        }],
+        ['use_aura==1',{
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../build/linux/system.gyp:fontconfig',
+            '../build/linux/system.gyp:x11',
+            '../ui/views/views.gyp:views',
+          ],
+          'include_dirs': [
+            '<(INTERMEDIATE_DIR)',
+            '<(INTERMEDIATE_DIR)/chrome',
+          ],
+          'sources/': [
+            ['include', '^browser/chromeos/status/memory_menu_button.cc'],
+            ['include', '^browser/chromeos/status/memory_menu_button.h'],
+          ],
+        }],
+      ],
+    },
+    {
+      # Protobuf compiler / generator for the Drive protocol buffer.
+      'target_name': 'drive_proto',
+      'type': 'static_library',
+      'sources': [ 'browser/chromeos/drive/drive.proto' ],
+      'variables': {
+        'proto_in_dir': 'browser/chromeos/drive',
+        'proto_out_dir': 'chrome/browser/chromeos/drive',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generator for device settings protocol buffers.
+      'target_name': 'device_policy_proto',
+      'type': 'static_library',
+      'sources': [
+        'browser/policy/proto/chromeos/chrome_device_policy.proto',
+        'browser/policy/proto/chromeos/install_attributes.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/policy/proto/chromeos',
+        'proto_out_dir': 'chrome/browser/policy/proto/chromeos',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+    {
+      # Protobuf compiler / generator for attestation protocol buffers.
+      'target_name': 'attestation_proto',
+      'type': 'static_library',
+      'sources': [
+        'browser/chromeos/attestation/attestation_key_payload.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/chromeos/attestation',
+        'proto_out_dir': 'chrome/browser/chromeos/attestation',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+  ],
+}
diff --git a/chromium/chrome/chrome_browser_extensions.gypi b/chromium/chrome/chrome_browser_extensions.gypi
new file mode 100644
index 00000000000..c477498338d
--- /dev/null
+++ b/chromium/chrome/chrome_browser_extensions.gypi
@@ -0,0 +1,1028 @@
+# Copyright (c) 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'browser_extensions',
+      'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      # Since browser and browser_extensions actually depend on each other,
+      # we must omit the dependency from browser_extensions to browser.
+      # However, this means browser_extensions and browser should more or less
+      # have the same dependencies. Once browser_extensions is untangled from
+      # browser, then we can clean up these dependencies.
+      'dependencies': [
+        'chrome_resources.gyp:chrome_extra_resources',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:platform_locale_settings',
+        'chrome_resources.gyp:theme_resources',
+        'common',
+        'common/extensions/api/api.gyp:api',
+        'common_net',
+        'debugger',
+        'in_memory_url_index_cache_proto',
+        'installer_util',
+        '../content/content.gyp:content_browser',
+        '../crypto/crypto.gyp:crypto',
+        '../device/bluetooth/bluetooth.gyp:device_bluetooth',
+        '../net/net.gyp:net',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/libusb/libusb.gyp:libusb',
+        '../third_party/re2/re2.gyp:re2',
+        '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/ui.gyp:ui',
+        '../ui/ui.gyp:ui_resources',
+        '../url/url.gyp:url_lib',
+        '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+        '../webkit/storage_browser.gyp:webkit_storage_browser',
+        '../webkit/storage_common.gyp:webkit_storage_common',
+        '../webkit/webkit_resources.gyp:webkit_resources',
+      ],
+      'include_dirs': [
+        '..',
+        '<(INTERMEDIATE_DIR)',
+      ],
+      'sources': [
+        # All .cc, .h, .m, and .mm files under browser/extensions except for
+        # tests and mocks.
+        '../extensions/browser/extension_prefs_scope.h',
+        '../extensions/browser/extension_error.cc',
+        '../extensions/browser/extension_error.h',
+        '../extensions/browser/file_reader.cc',
+        '../extensions/browser/file_reader.h',
+        '../extensions/browser/pref_names.cc',
+        '../extensions/browser/pref_names.h',
+        '../extensions/browser/view_type_utils.cc',
+        '../extensions/browser/view_type_utils.h',
+        'browser/apps/shortcut_manager.cc',
+        'browser/apps/shortcut_manager.h',
+        'browser/apps/shortcut_manager_factory.cc',
+        'browser/apps/shortcut_manager_factory.h',
+        'browser/extensions/active_tab_permission_granter.cc',
+        'browser/extensions/active_tab_permission_granter.h',
+        'browser/extensions/activity_log/activity_action_constants.cc',
+        'browser/extensions/activity_log/activity_action_constants.h',
+        'browser/extensions/activity_log/activity_actions.cc',
+        'browser/extensions/activity_log/activity_actions.h',
+        'browser/extensions/activity_log/activity_database.cc',
+        'browser/extensions/activity_log/activity_database.h',
+        'browser/extensions/activity_log/activity_log.cc',
+        'browser/extensions/activity_log/activity_log.h',
+        'browser/extensions/activity_log/activity_log_policy.cc',
+        'browser/extensions/activity_log/activity_log_policy.h',
+        'browser/extensions/activity_log/counting_policy.cc',
+        'browser/extensions/activity_log/counting_policy.h',
+        'browser/extensions/activity_log/database_string_table.cc',
+        'browser/extensions/activity_log/database_string_table.h',
+        'browser/extensions/activity_log/fullstream_ui_policy.cc',
+        'browser/extensions/activity_log/fullstream_ui_policy.h',
+        'browser/extensions/activity_log/web_request_constants.cc',
+        'browser/extensions/activity_log/web_request_constants.h',
+        'browser/extensions/admin_policy.cc',
+        'browser/extensions/admin_policy.h',
+        'browser/extensions/api/activity_log_private/activity_log_private_api.cc',
+        'browser/extensions/api/activity_log_private/activity_log_private_api.h',
+        'browser/extensions/api/api_function.cc',
+        'browser/extensions/api/api_function.h',
+        'browser/extensions/api/api_resource.cc',
+        'browser/extensions/api/api_resource.h',
+        'browser/extensions/api/api_resource_manager.h',
+        'browser/extensions/api/alarms/alarm_manager.cc',
+        'browser/extensions/api/alarms/alarm_manager.h',
+        'browser/extensions/api/alarms/alarms_api.cc',
+        'browser/extensions/api/alarms/alarms_api.h',
+        'browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc',
+        'browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h',
+        'browser/extensions/api/app_runtime/app_runtime_api.cc',
+        'browser/extensions/api/app_runtime/app_runtime_api.h',
+        'browser/extensions/api/app_window/app_window_api.cc',
+        'browser/extensions/api/app_window/app_window_api.h',
+        'browser/extensions/api/audio/audio_api.cc',
+        'browser/extensions/api/audio/audio_api.h',
+        'browser/extensions/api/audio/audio_service.cc',
+        'browser/extensions/api/audio/audio_service.h',
+        'browser/extensions/api/audio/audio_service_chromeos.cc',
+        'browser/extensions/api/autotest_private/autotest_private_api.cc',
+        'browser/extensions/api/autotest_private/autotest_private_api.h',
+        'browser/extensions/api/autotest_private/autotest_private_api_factory.cc',
+        'browser/extensions/api/autotest_private/autotest_private_api_factory.h',
+        'browser/extensions/api/bluetooth/bluetooth_api.cc',
+        'browser/extensions/api/bluetooth/bluetooth_api.h',
+        'browser/extensions/api/bluetooth/bluetooth_api_factory.cc',
+        'browser/extensions/api/bluetooth/bluetooth_api_factory.h',
+        'browser/extensions/api/bluetooth/bluetooth_api_utils.cc',
+        'browser/extensions/api/bluetooth/bluetooth_api_utils.h',
+        'browser/extensions/api/bluetooth/bluetooth_event_router.cc',
+        'browser/extensions/api/bluetooth/bluetooth_event_router.h',
+        'browser/extensions/api/bluetooth/bluetooth_extension_function.cc',
+        'browser/extensions/api/bluetooth/bluetooth_extension_function.h',
+        'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc',
+        'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h',
+        'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_constants.cc',
+        'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_constants.h',
+        'browser/extensions/api/bookmarks/bookmark_api_constants.cc',
+        'browser/extensions/api/bookmarks/bookmark_api_constants.h',
+        'browser/extensions/api/bookmarks/bookmark_api_helpers.cc',
+        'browser/extensions/api/bookmarks/bookmark_api_helpers.h',
+        'browser/extensions/api/bookmarks/bookmarks_api.cc',
+        'browser/extensions/api/bookmarks/bookmarks_api.h',
+        'browser/extensions/api/browsing_data/browsing_data_api.cc',
+        'browser/extensions/api/browsing_data/browsing_data_api.h',
+        'browser/extensions/api/cloud_print_private/cloud_print_private_api.cc',
+        'browser/extensions/api/cloud_print_private/cloud_print_private_api.h',
+        'browser/extensions/api/command_line_private/command_line_private_api.cc',
+        'browser/extensions/api/command_line_private/command_line_private_api.h',
+        'browser/extensions/api/commands/command_service.cc',
+        'browser/extensions/api/commands/command_service.h',
+        'browser/extensions/api/content_settings/content_settings_api.cc',
+        'browser/extensions/api/content_settings/content_settings_api.h',
+        'browser/extensions/api/content_settings/content_settings_api_constants.cc',
+        'browser/extensions/api/content_settings/content_settings_api_constants.h',
+        'browser/extensions/api/content_settings/content_settings_helpers.cc',
+        'browser/extensions/api/content_settings/content_settings_helpers.h',
+        'browser/extensions/api/content_settings/content_settings_store.cc',
+        'browser/extensions/api/content_settings/content_settings_store.h',
+        'browser/extensions/api/commands/commands.cc',
+        'browser/extensions/api/commands/commands.h',
+        'browser/extensions/api/context_menus/context_menus_api.cc',
+        'browser/extensions/api/context_menus/context_menus_api.h',
+        'browser/extensions/api/cookies/cookies_api.cc',
+        'browser/extensions/api/cookies/cookies_api.h',
+        'browser/extensions/api/cookies/cookies_api_constants.cc',
+        'browser/extensions/api/cookies/cookies_api_constants.h',
+        'browser/extensions/api/cookies/cookies_helpers.cc',
+        'browser/extensions/api/cookies/cookies_helpers.h',
+        'browser/extensions/api/debugger/debugger_api.cc',
+        'browser/extensions/api/debugger/debugger_api.h',
+        'browser/extensions/api/debugger/debugger_api_constants.cc',
+        'browser/extensions/api/debugger/debugger_api_constants.h',
+        'browser/extensions/api/declarative/deduping_factory.h',
+        'browser/extensions/api/declarative/declarative_api.cc',
+        'browser/extensions/api/declarative/declarative_api.h',
+        'browser/extensions/api/declarative/declarative_rule.h',
+        'browser/extensions/api/declarative/initializing_rules_registry.cc',
+        'browser/extensions/api/declarative/initializing_rules_registry.h',
+        'browser/extensions/api/declarative/rules_registry.h',
+        'browser/extensions/api/declarative/rules_registry_service.cc',
+        'browser/extensions/api/declarative/rules_registry_service.h',
+        'browser/extensions/api/declarative/rules_registry_with_cache.cc',
+        'browser/extensions/api/declarative/rules_registry_with_cache.h',
+        'browser/extensions/api/declarative/test_rules_registry.cc',
+        'browser/extensions/api/declarative/test_rules_registry.h',
+        'browser/extensions/api/declarative_content/content_action.cc',
+        'browser/extensions/api/declarative_content/content_action.h',
+        'browser/extensions/api/declarative_content/content_condition.cc',
+        'browser/extensions/api/declarative_content/content_condition.h',
+        'browser/extensions/api/declarative_content/content_constants.cc',
+        'browser/extensions/api/declarative_content/content_constants.h',
+        'browser/extensions/api/declarative_content/content_rules_registry.cc',
+        'browser/extensions/api/declarative_content/content_rules_registry.h',
+        'browser/extensions/api/declarative_webrequest/request_stage.cc',
+        'browser/extensions/api/declarative_webrequest/request_stage.h',
+        'browser/extensions/api/declarative_webrequest/webrequest_action.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_action.h',
+        'browser/extensions/api/declarative_webrequest/webrequest_condition.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_condition.h',
+        'browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h',
+        'browser/extensions/api/declarative_webrequest/webrequest_constants.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_constants.h',
+        'browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h',
+        'browser/extensions/api/desktop_capture/desktop_capture_api.cc',
+        'browser/extensions/api/desktop_capture/desktop_capture_api.h',
+        'browser/extensions/api/developer_private/developer_private_api.cc',
+        'browser/extensions/api/developer_private/developer_private_api.h',
+        'browser/extensions/api/developer_private/developer_private_api_factory.cc',
+        'browser/extensions/api/developer_private/developer_private_api_factory.h',
+        'browser/extensions/api/developer_private/entry_picker.cc',
+        'browser/extensions/api/developer_private/entry_picker.h',
+        'browser/extensions/api/dial/dial_api.cc',
+        'browser/extensions/api/dial/dial_api.h',
+        'browser/extensions/api/dial/dial_api_factory.cc',
+        'browser/extensions/api/dial/dial_api_factory.h',
+        'browser/extensions/api/dial/dial_device_data.cc',
+        'browser/extensions/api/dial/dial_device_data.h',
+        'browser/extensions/api/dial/dial_registry.cc',
+        'browser/extensions/api/dial/dial_registry.h',
+        'browser/extensions/api/dial/dial_service.cc',
+        'browser/extensions/api/dial/dial_service.h',
+        'browser/extensions/api/discovery/discovery_api.cc',
+        'browser/extensions/api/discovery/discovery_api.h',
+        'browser/extensions/api/discovery/suggested_link.cc',
+        'browser/extensions/api/discovery/suggested_link.h',
+        'browser/extensions/api/discovery/suggested_links_registry.cc',
+        'browser/extensions/api/discovery/suggested_links_registry.h',
+        'browser/extensions/api/discovery/suggested_links_registry_factory.cc',
+        'browser/extensions/api/discovery/suggested_links_registry_factory.h',
+        'browser/extensions/api/dns/dns_api.cc',
+        'browser/extensions/api/dns/dns_api.h',
+        'browser/extensions/api/dns/host_resolver_wrapper.cc',
+        'browser/extensions/api/dns/host_resolver_wrapper.h',
+        'browser/extensions/api/downloads/downloads_api.cc',
+        'browser/extensions/api/downloads/downloads_api.h',
+        'browser/extensions/api/extension_action/extension_action_api.cc',
+        'browser/extensions/api/extension_action/extension_action_api.h',
+        'browser/extensions/api/downloads_internal/downloads_internal_api.cc',
+        'browser/extensions/api/downloads_internal/downloads_internal_api.h',
+        'browser/extensions/api/execute_code_function.cc',
+        'browser/extensions/api/execute_code_function.h',
+        'browser/extensions/api/extension_action/extension_page_actions_api_constants.cc',
+        'browser/extensions/api/extension_action/extension_page_actions_api_constants.h',
+        'browser/extensions/api/feedback_private/blob_reader.cc',
+        'browser/extensions/api/feedback_private/blob_reader.h',
+        'browser/extensions/api/feedback_private/feedback_private_api.cc',
+        'browser/extensions/api/feedback_private/feedback_private_api.h',
+        'browser/extensions/api/feedback_private/feedback_service.cc',
+        'browser/extensions/api/feedback_private/feedback_service.h',
+        'browser/extensions/api/feedback_private/feedback_service_chromeos.cc',
+        'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc',
+        'browser/extensions/api/file_handlers/app_file_handler_util.cc',
+        'browser/extensions/api/file_handlers/app_file_handler_util.h',
+        'browser/extensions/api/file_system/file_system_api.cc',
+        'browser/extensions/api/file_system/file_system_api.h',
+        'browser/extensions/api/font_settings/font_settings_api.cc',
+        'browser/extensions/api/font_settings/font_settings_api.h',
+        'browser/extensions/api/history/history_api.h',
+        'browser/extensions/api/history/history_api.cc',
+        'browser/extensions/api/i18n/i18n_api.cc',
+        'browser/extensions/api/i18n/i18n_api.h',
+        'browser/extensions/api/identity/experimental_identity_api.cc',
+        'browser/extensions/api/identity/experimental_identity_api.h',
+        'browser/extensions/api/identity/experimental_web_auth_flow.cc',
+        'browser/extensions/api/identity/experimental_web_auth_flow.h',
+        'browser/extensions/api/identity/gaia_web_auth_flow.cc',
+        'browser/extensions/api/identity/gaia_web_auth_flow.h',
+        'browser/extensions/api/identity/identity_api.cc',
+        'browser/extensions/api/identity/identity_api.h',
+        'browser/extensions/api/identity/identity_mint_queue.cc',
+        'browser/extensions/api/identity/identity_mint_queue.h',
+        'browser/extensions/api/identity/identity_signin_flow.cc',
+        'browser/extensions/api/identity/identity_signin_flow.h',
+        'browser/extensions/api/identity/web_auth_flow.cc',
+        'browser/extensions/api/identity/web_auth_flow.h',
+        'browser/extensions/api/identity_private/identity_private_api.cc',
+        'browser/extensions/api/identity_private/identity_private_api.h',
+        'browser/extensions/api/idle/idle_api.cc',
+        'browser/extensions/api/idle/idle_api.h',
+        'browser/extensions/api/idle/idle_api_constants.cc',
+        'browser/extensions/api/idle/idle_api_constants.h',
+        'browser/extensions/api/idle/idle_manager.cc',
+        'browser/extensions/api/idle/idle_manager.h',
+        'browser/extensions/api/idle/idle_manager_factory.cc',
+        'browser/extensions/api/idle/idle_manager_factory.h',
+        'browser/extensions/api/idltest/idltest_api.cc',
+        'browser/extensions/api/idltest/idltest_api.h',
+        'browser/extensions/api/input/input.cc',
+        'browser/extensions/api/input/input.h',
+        'browser/extensions/api/location/location_api.cc',
+        'browser/extensions/api/location/location_api.h',
+        'browser/extensions/api/location/location_manager.cc',
+        'browser/extensions/api/location/location_manager.h',
+        'browser/extensions/api/log_private/filter_handler.cc',
+        'browser/extensions/api/log_private/filter_handler.h',
+        'browser/extensions/api/log_private/log_parser.cc',
+        'browser/extensions/api/log_private/log_parser.h',
+        'browser/extensions/api/log_private/log_private_api.h',
+        'browser/extensions/api/log_private/log_private_api_nonchromeos.cc',
+        'browser/extensions/api/log_private/syslog_parser.cc',
+        'browser/extensions/api/log_private/syslog_parser.h',
+        'browser/extensions/api/management/management_api.cc',
+        'browser/extensions/api/management/management_api.h',
+        'browser/extensions/api/management/management_api_constants.cc',
+        'browser/extensions/api/management/management_api_constants.h',
+        'browser/extensions/api/media_galleries/media_galleries_api.cc',
+        'browser/extensions/api/media_galleries/media_galleries_api.h',
+        'browser/extensions/api/media_galleries_private/gallery_watch_manager.cc',
+        'browser/extensions/api/media_galleries_private/gallery_watch_manager.h',
+        'browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc',
+        'browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h',
+        'browser/extensions/api/media_galleries_private/media_galleries_private_api.cc',
+        'browser/extensions/api/media_galleries_private/media_galleries_private_api.h',
+        'browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc',
+        'browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h',
+        'browser/extensions/api/messaging/extension_message_port.cc',
+        'browser/extensions/api/messaging/extension_message_port.h',
+        'browser/extensions/api/messaging/message_service.cc',
+        'browser/extensions/api/messaging/message_service.h',
+        'browser/extensions/api/messaging/native_message_process_host.cc',
+        'browser/extensions/api/messaging/native_message_process_host.h',
+        'browser/extensions/api/messaging/native_process_launcher_posix.cc',
+        'browser/extensions/api/messaging/native_process_launcher_win.cc',
+        'browser/extensions/api/messaging/native_process_launcher.cc',
+        'browser/extensions/api/messaging/native_process_launcher.h',
+        'browser/extensions/api/messaging/native_messaging_host_manifest.cc',
+        'browser/extensions/api/messaging/native_messaging_host_manifest.h',
+        'browser/extensions/api/messaging/native_message_port.cc',
+        'browser/extensions/api/messaging/native_message_port.h',
+        'browser/extensions/api/metrics_private/metrics_private_api.cc',
+        'browser/extensions/api/metrics_private/metrics_private_api.h',
+        'browser/extensions/api/module/module.cc',
+        'browser/extensions/api/module/module.h',
+        'browser/extensions/api/music_manager_private/device_id.cc',
+        'browser/extensions/api/music_manager_private/device_id.h',
+        'browser/extensions/api/music_manager_private/device_id_chromeos.cc',
+        'browser/extensions/api/music_manager_private/device_id_linux.cc',
+        'browser/extensions/api/music_manager_private/device_id_mac.cc',
+        'browser/extensions/api/music_manager_private/device_id_win.cc',
+        'browser/extensions/api/music_manager_private/music_manager_private_api.cc',
+        'browser/extensions/api/music_manager_private/music_manager_private_api.h',
+        'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
+        'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
+        'browser/extensions/api/networking_private/networking_private_api.h',
+        'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
+        'browser/extensions/api/networking_private/networking_private_event_router.h',
+        'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
+        'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
+        'browser/extensions/api/notifications/notifications_api.cc',
+        'browser/extensions/api/notifications/notifications_api.h',
+        'browser/extensions/api/omnibox/omnibox_api.cc',
+        'browser/extensions/api/omnibox/omnibox_api.h',
+        'browser/extensions/api/page_capture/page_capture_api.cc',
+        'browser/extensions/api/page_capture/page_capture_api.h',
+        'browser/extensions/api/permissions/permissions_api.cc',
+        'browser/extensions/api/permissions/permissions_api.h',
+        'browser/extensions/api/permissions/permissions_api_helpers.cc',
+        'browser/extensions/api/permissions/permissions_api_helpers.h',
+        'browser/extensions/api/diagnostics/diagnostics_api.cc',
+        'browser/extensions/api/diagnostics/diagnostics_api.h',
+        'browser/extensions/api/diagnostics/diagnostics_api_nonchromeos.cc',
+        'browser/extensions/api/diagnostics/diagnostics_api_chromeos.cc',
+        'browser/extensions/api/power/power_api.cc',
+        'browser/extensions/api/power/power_api.h',
+        'browser/extensions/api/power/power_api_manager.cc',
+        'browser/extensions/api/power/power_api_manager.h',
+        'browser/extensions/api/preference/chrome_direct_setting.cc',
+        'browser/extensions/api/preference/chrome_direct_setting.h',
+        'browser/extensions/api/preference/chrome_direct_setting_api.cc',
+        'browser/extensions/api/preference/chrome_direct_setting_api.h',
+        'browser/extensions/api/preference/preference_api.cc',
+        'browser/extensions/api/preference/preference_api.h',
+        'browser/extensions/api/preference/preference_api_constants.cc',
+        'browser/extensions/api/preference/preference_api_constants.h',
+        'browser/extensions/api/preference/preference_helpers.cc',
+        'browser/extensions/api/preference/preference_helpers.h',
+        'browser/extensions/api/processes/processes_api.cc',
+        'browser/extensions/api/processes/processes_api.h',
+        'browser/extensions/api/processes/processes_api_constants.cc',
+        'browser/extensions/api/processes/processes_api_constants.h',
+        'browser/extensions/api/profile_keyed_api_factory.h',
+        'browser/extensions/api/proxy/proxy_api.cc',
+        'browser/extensions/api/proxy/proxy_api.h',
+        'browser/extensions/api/proxy/proxy_api_constants.cc',
+        'browser/extensions/api/proxy/proxy_api_constants.h',
+        'browser/extensions/api/proxy/proxy_api_helpers.cc',
+        'browser/extensions/api/proxy/proxy_api_helpers.h',
+        'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc',
+        'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h',
+        'browser/extensions/api/push_messaging/push_messaging_api.cc',
+        'browser/extensions/api/push_messaging/push_messaging_api.h',
+        'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc',
+        'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h',
+        'browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h',
+        'browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h',
+        'browser/extensions/api/recovery_private/recovery_operation.cc',
+        'browser/extensions/api/recovery_private/recovery_operation.h',
+        'browser/extensions/api/recovery_private/recovery_operation_manager.cc',
+        'browser/extensions/api/recovery_private/recovery_operation_manager.h',
+        'browser/extensions/api/recovery_private/recovery_private_api.cc',
+        'browser/extensions/api/recovery_private/recovery_private_api.h',
+        'browser/extensions/api/recovery_private/write_from_file_operation.cc',
+        'browser/extensions/api/recovery_private/write_from_file_operation.h',
+        'browser/extensions/api/recovery_private/write_from_url_operation.cc',
+        'browser/extensions/api/recovery_private/write_from_url_operation.h',
+        'browser/extensions/api/runtime/runtime_api.cc',
+        'browser/extensions/api/runtime/runtime_api.h',
+        'browser/extensions/api/serial/serial_api.cc',
+        'browser/extensions/api/serial/serial_api.h',
+        'browser/extensions/api/serial/serial_connection.cc',
+        'browser/extensions/api/serial/serial_connection.h',
+        'browser/extensions/api/serial/serial_connection_posix.cc',
+        'browser/extensions/api/serial/serial_connection_win.cc',
+        'browser/extensions/api/serial/serial_port_enumerator.cc',
+        'browser/extensions/api/serial/serial_port_enumerator.h',
+        'browser/extensions/api/serial/serial_port_enumerator_posix.cc',
+        'browser/extensions/api/serial/serial_port_enumerator_win.cc',
+        'browser/extensions/api/session_restore/session_restore_api.cc',
+        'browser/extensions/api/session_restore/session_restore_api.h',
+        'browser/extensions/api/signedin_devices/id_mapping_helper.cc',
+        'browser/extensions/api/signedin_devices/id_mapping_helper.h',
+        'browser/extensions/api/signedin_devices/signedin_devices_api.cc',
+        'browser/extensions/api/signedin_devices/signedin_devices_api.h',
+        'browser/extensions/api/socket/socket.cc',
+        'browser/extensions/api/socket/socket.h',
+        'browser/extensions/api/socket/socket_api.cc',
+        'browser/extensions/api/socket/socket_api.h',
+        'browser/extensions/api/socket/tcp_socket.cc',
+        'browser/extensions/api/socket/tcp_socket.h',
+        'browser/extensions/api/socket/udp_socket.cc',
+        'browser/extensions/api/socket/udp_socket.h',
+        'browser/extensions/api/spellcheck/spellcheck_api.cc',
+        'browser/extensions/api/spellcheck/spellcheck_api.h',
+        'browser/extensions/api/storage/leveldb_settings_storage_factory.cc',
+        'browser/extensions/api/storage/leveldb_settings_storage_factory.h',
+        'browser/extensions/api/storage/managed_value_store_cache.cc',
+        'browser/extensions/api/storage/managed_value_store_cache.h',
+        'browser/extensions/api/storage/policy_value_store.cc',
+        'browser/extensions/api/storage/policy_value_store.h',
+        'browser/extensions/api/storage/setting_sync_data.cc',
+        'browser/extensions/api/storage/setting_sync_data.h',
+        'browser/extensions/api/storage/settings_backend.cc',
+        'browser/extensions/api/storage/settings_backend.h',
+        'browser/extensions/api/storage/settings_frontend.cc',
+        'browser/extensions/api/storage/settings_frontend.h',
+        'browser/extensions/api/storage/settings_namespace.cc',
+        'browser/extensions/api/storage/settings_namespace.h',
+        'browser/extensions/api/storage/settings_observer.h',
+        'browser/extensions/api/storage/settings_storage_factory.h',
+        'browser/extensions/api/storage/settings_storage_quota_enforcer.cc',
+        'browser/extensions/api/storage/settings_storage_quota_enforcer.h',
+        'browser/extensions/api/storage/settings_sync_processor.cc',
+        'browser/extensions/api/storage/settings_sync_processor.h',
+        'browser/extensions/api/storage/settings_sync_util.cc',
+        'browser/extensions/api/storage/settings_sync_util.h',
+        'browser/extensions/api/storage/storage_api.cc',
+        'browser/extensions/api/storage/storage_api.h',
+        'browser/extensions/api/storage/sync_or_local_value_store_cache.cc',
+        'browser/extensions/api/storage/sync_or_local_value_store_cache.h',
+        'browser/extensions/api/storage/syncable_settings_storage.cc',
+        'browser/extensions/api/storage/syncable_settings_storage.h',
+        'browser/extensions/api/storage/value_store_cache.cc',
+        'browser/extensions/api/storage/value_store_cache.h',
+        'browser/extensions/api/storage/weak_unlimited_settings_storage.cc',
+        'browser/extensions/api/storage/weak_unlimited_settings_storage.h',
+        'browser/extensions/api/streams_private/streams_private_api.cc',
+        'browser/extensions/api/streams_private/streams_private_api.h',
+        'browser/extensions/api/sync_file_system/extension_sync_event_observer_factory.cc',
+        'browser/extensions/api/sync_file_system/extension_sync_event_observer_factory.h',
+        'browser/extensions/api/sync_file_system/extension_sync_event_observer.cc',
+        'browser/extensions/api/sync_file_system/extension_sync_event_observer.h',
+        'browser/extensions/api/sync_file_system/sync_file_system_api.cc',
+        'browser/extensions/api/sync_file_system/sync_file_system_api.h',
+        'browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc',
+        'browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h',
+        'browser/extensions/api/system_cpu/cpu_info_provider.cc',
+        'browser/extensions/api/system_cpu/cpu_info_provider.h',
+        'browser/extensions/api/system_cpu/system_cpu_api.cc',
+        'browser/extensions/api/system_cpu/system_cpu_api.h',
+        'browser/extensions/api/system_display/display_info_provider.cc',
+        'browser/extensions/api/system_display/display_info_provider.h',
+        'browser/extensions/api/system_display/display_info_provider_chromeos.cc',
+        'browser/extensions/api/system_display/display_info_provider_mac.cc',
+        'browser/extensions/api/system_display/display_info_provider_win.cc',
+        'browser/extensions/api/system_display/display_info_provider_x11.cc',
+        'browser/extensions/api/system_display/system_display_api.cc',
+        'browser/extensions/api/system_display/system_display_api.h',
+        'browser/extensions/api/system_indicator/system_indicator_api.h',
+        'browser/extensions/api/system_indicator/system_indicator_manager.cc',
+        'browser/extensions/api/system_indicator/system_indicator_manager.h',
+        'browser/extensions/api/system_indicator/system_indicator_manager_factory.cc',
+        'browser/extensions/api/system_indicator/system_indicator_manager_factory.h',
+        'browser/extensions/api/system_memory/memory_info_provider.cc',
+        'browser/extensions/api/system_memory/memory_info_provider.h',
+        'browser/extensions/api/system_memory/system_memory_api.cc',
+        'browser/extensions/api/system_memory/system_memory_api.h',
+        'browser/extensions/api/system_storage/storage_info_provider.cc',
+        'browser/extensions/api/system_storage/storage_info_provider.h',
+        'browser/extensions/api/system_storage/system_storage_api.cc',
+        'browser/extensions/api/system_storage/system_storage_api.h',
+        'browser/extensions/api/tab_capture/tab_capture_api.cc',
+        'browser/extensions/api/tab_capture/tab_capture_api.h',
+        'browser/extensions/api/tab_capture/tab_capture_registry.cc',
+        'browser/extensions/api/tab_capture/tab_capture_registry.h',
+        'browser/extensions/api/tab_capture/tab_capture_registry_factory.cc',
+        'browser/extensions/api/tab_capture/tab_capture_registry_factory.h',
+        'browser/extensions/api/tabs/tabs_api.cc',
+        'browser/extensions/api/tabs/tabs_api.h',
+        'browser/extensions/api/tabs/tabs_windows_api.cc',
+        'browser/extensions/api/tabs/tabs_windows_api.h',
+        'browser/extensions/api/tabs/tabs_constants.cc',
+        'browser/extensions/api/tabs/tabs_constants.h',
+        'browser/extensions/api/tabs/windows_event_router.cc',
+        'browser/extensions/api/tabs/windows_event_router.h',
+        'browser/extensions/api/test/test_api.cc',
+        'browser/extensions/api/test/test_api.h',
+        'browser/extensions/api/top_sites/top_sites_api.cc',
+        'browser/extensions/api/top_sites/top_sites_api.h',
+        'browser/extensions/api/usb/usb_api.cc',
+        'browser/extensions/api/usb/usb_api.h',
+        'browser/extensions/api/usb/usb_device_resource.cc',
+        'browser/extensions/api/usb/usb_device_resource.h',
+        'browser/extensions/api/web_navigation/frame_navigation_state.cc',
+        'browser/extensions/api/web_navigation/frame_navigation_state.h',
+        'browser/extensions/api/web_navigation/web_navigation_api.cc',
+        'browser/extensions/api/web_navigation/web_navigation_api.h',
+        'browser/extensions/api/web_navigation/web_navigation_api_constants.cc',
+        'browser/extensions/api/web_navigation/web_navigation_api_constants.h',
+        'browser/extensions/api/web_navigation/web_navigation_api_helpers.cc',
+        'browser/extensions/api/web_navigation/web_navigation_api_helpers.h',
+        'browser/extensions/api/web_request/form_data_parser.cc',
+        'browser/extensions/api/web_request/form_data_parser.h',
+        'browser/extensions/api/web_request/upload_data_presenter.cc',
+        'browser/extensions/api/web_request/upload_data_presenter.h',
+        'browser/extensions/api/web_request/web_request_api.cc',
+        'browser/extensions/api/web_request/web_request_api.h',
+        'browser/extensions/api/web_request/web_request_api_constants.cc',
+        'browser/extensions/api/web_request/web_request_api_constants.h',
+        'browser/extensions/api/web_request/web_request_api_helpers.cc',
+        'browser/extensions/api/web_request/web_request_api_helpers.h',
+        'browser/extensions/api/web_request/web_request_permissions.cc',
+        'browser/extensions/api/web_request/web_request_permissions.h',
+        'browser/extensions/api/web_request/web_request_time_tracker.cc',
+        'browser/extensions/api/web_request/web_request_time_tracker.h',
+        'browser/extensions/api/webstore_private/webstore_private_api.cc',
+        'browser/extensions/api/webstore_private/webstore_private_api.h',
+        'browser/extensions/api/webview/webview_api.cc',
+        'browser/extensions/api/webview/webview_api.h',
+        'browser/extensions/app_icon_loader.h',
+        'browser/extensions/app_icon_loader_impl.cc',
+        'browser/extensions/app_icon_loader_impl.h',
+        'browser/extensions/app_sync_bundle.cc',
+        'browser/extensions/app_sync_bundle.h',
+        'browser/extensions/app_sync_data.cc',
+        'browser/extensions/app_sync_data.h',
+        'browser/extensions/blacklist.cc',
+        'browser/extensions/blacklist.h',
+        'browser/extensions/browser_action_test_util.h',
+        'browser/extensions/browser_event_router.cc',
+        'browser/extensions/browser_event_router.h',
+        'browser/extensions/browser_extension_window_controller.cc',
+        'browser/extensions/browser_extension_window_controller.h',
+        'browser/extensions/browser_permissions_policy_delegate.cc',
+        'browser/extensions/browser_permissions_policy_delegate.h',
+        'browser/extensions/bundle_installer.cc',
+        'browser/extensions/bundle_installer.h',
+        'browser/extensions/component_loader.cc',
+        'browser/extensions/component_loader.h',
+        'browser/extensions/context_menu_matcher.cc',
+        'browser/extensions/context_menu_matcher.h',
+        'browser/extensions/convert_user_script.cc',
+        'browser/extensions/convert_user_script.h',
+        'browser/extensions/convert_web_app.cc',
+        'browser/extensions/convert_web_app.h',
+        'browser/extensions/crx_installer.cc',
+        'browser/extensions/crx_installer.h',
+        'browser/extensions/crx_installer_error.h',
+        'browser/extensions/data_deleter.cc',
+        'browser/extensions/data_deleter.h',
+        'browser/extensions/default_apps.cc',
+        'browser/extensions/default_apps.h',
+        'browser/extensions/error_console/error_console.cc',
+        'browser/extensions/error_console/error_console.h',
+        'browser/extensions/event_listener_map.cc',
+        'browser/extensions/event_listener_map.h',
+        'browser/extensions/event_names.cc',
+        'browser/extensions/event_names.h',
+        'browser/extensions/event_router.cc',
+        'browser/extensions/event_router.h',
+        'browser/extensions/event_router_forwarder.cc',
+        'browser/extensions/event_router_forwarder.h',
+        'browser/extensions/extension_action.cc',
+        'browser/extensions/extension_action.h',
+        'browser/extensions/extension_action_icon_factory.cc',
+        'browser/extensions/extension_action_icon_factory.h',
+        'browser/extensions/extension_action_manager.cc',
+        'browser/extensions/extension_action_manager.h',
+        'browser/extensions/extension_context_menu_model.cc',
+        'browser/extensions/extension_context_menu_model.h',
+        'browser/extensions/extension_creator.cc',
+        'browser/extensions/extension_creator.h',
+        'browser/extensions/extension_creator_filter.cc',
+        'browser/extensions/extension_creator_filter.h',
+        'browser/extensions/extension_disabled_ui.cc',
+        'browser/extensions/extension_disabled_ui.h',
+        'browser/extensions/extension_error_reporter.cc',
+        'browser/extensions/extension_error_reporter.h',
+        'browser/extensions/extension_error_ui.cc',
+        'browser/extensions/extension_error_ui.h',
+        'browser/extensions/extension_error_ui_default.cc',
+        'browser/extensions/extension_error_ui_default.h',
+        'browser/extensions/extension_function.cc',
+        'browser/extensions/extension_function.h',
+        'browser/extensions/extension_function_dispatcher.cc',
+        'browser/extensions/extension_function_dispatcher.h',
+        'browser/extensions/extension_function_registry.cc',
+        'browser/extensions/extension_function_registry.h',
+        'browser/extensions/extension_function_util.cc',
+        'browser/extensions/extension_function_util.h',
+        'browser/extensions/extension_host.cc',
+        'browser/extensions/extension_host.h',
+        'browser/extensions/extension_host_mac.h',
+        'browser/extensions/extension_host_mac.mm',
+        'browser/extensions/extension_icon_image.cc',
+        'browser/extensions/extension_icon_image.h',
+        'browser/extensions/extension_icon_manager.cc',
+        'browser/extensions/extension_icon_manager.h',
+        'browser/extensions/extension_info_map.cc',
+        'browser/extensions/extension_info_map.h',
+        'browser/extensions/extension_infobar_delegate.cc',
+        'browser/extensions/extension_infobar_delegate.h',
+        'browser/extensions/extension_install_prompt.cc',
+        'browser/extensions/extension_install_prompt.h',
+        'browser/extensions/extension_install_ui.cc',
+        'browser/extensions/extension_install_ui.h',
+        'browser/extensions/extension_installer.cc',
+        'browser/extensions/extension_installer.h',
+        'browser/extensions/extension_keybinding_registry.cc',
+        'browser/extensions/extension_keybinding_registry.h',
+        'browser/extensions/extension_pref_store.cc',
+        'browser/extensions/extension_pref_store.h',
+        'browser/extensions/extension_pref_value_map.cc',
+        'browser/extensions/extension_pref_value_map.h',
+        'browser/extensions/extension_pref_value_map_factory.cc',
+        'browser/extensions/extension_pref_value_map_factory.h',
+        'browser/extensions/extension_prefs.cc',
+        'browser/extensions/extension_prefs.h',
+        'browser/extensions/extension_prefs_factory.cc',
+        'browser/extensions/extension_prefs_factory.h',
+        'browser/extensions/extension_process_manager.cc',
+        'browser/extensions/extension_process_manager.h',
+        'browser/extensions/extension_protocols.cc',
+        'browser/extensions/extension_protocols.h',
+        'browser/extensions/extension_renderer_state.cc',
+        'browser/extensions/extension_renderer_state.h',
+        'browser/extensions/extension_resource_protocols.cc',
+        'browser/extensions/extension_resource_protocols.h',
+        'browser/extensions/extension_scoped_prefs.h',
+        'browser/extensions/extension_service.cc',
+        'browser/extensions/extension_service.h',
+        'browser/extensions/extension_sorting.cc',
+        'browser/extensions/extension_sorting.h',
+        'browser/extensions/extension_special_storage_policy.cc',
+        'browser/extensions/extension_special_storage_policy.h',
+        'browser/extensions/extension_system.cc',
+        'browser/extensions/extension_system.h',
+        'browser/extensions/extension_sync_bundle.cc',
+        'browser/extensions/extension_sync_bundle.h',
+        'browser/extensions/extension_system_factory.cc',
+        'browser/extensions/extension_system_factory.h',
+        'browser/extensions/extension_sync_data.cc',
+        'browser/extensions/extension_sync_data.h',
+        'browser/extensions/extension_tab_util.cc',
+        'browser/extensions/extension_tab_util.h',
+        'browser/extensions/extension_toolbar_model.cc',
+        'browser/extensions/extension_toolbar_model.h',
+        'browser/extensions/extension_uninstall_dialog.cc',
+        'browser/extensions/extension_uninstall_dialog.h',
+        'browser/extensions/extension_warning_badge_service.cc',
+        'browser/extensions/extension_warning_badge_service.h',
+        'browser/extensions/extension_warning_service.cc',
+        'browser/extensions/extension_warning_service.h',
+        'browser/extensions/extension_warning_set.cc',
+        'browser/extensions/extension_warning_set.h',
+        'browser/extensions/extension_web_ui.cc',
+        'browser/extensions/extension_web_ui.h',
+        'browser/extensions/extension_web_ui_override_registrar.cc',
+        'browser/extensions/extension_web_ui_override_registrar.h',
+        'browser/extensions/extension_webkit_preferences.cc',
+        'browser/extensions/extension_webkit_preferences.h',
+        'browser/extensions/extensions_quota_service.cc',
+        'browser/extensions/extensions_quota_service.h',
+        'browser/extensions/external_component_loader.cc',
+        'browser/extensions/external_component_loader.h',
+        'browser/extensions/external_install_ui.cc',
+        'browser/extensions/external_install_ui.h',
+        'browser/extensions/external_loader.cc',
+        'browser/extensions/external_loader.h',
+        'browser/extensions/external_policy_loader.cc',
+        'browser/extensions/external_policy_loader.h',
+        'browser/extensions/external_pref_loader.cc',
+        'browser/extensions/external_pref_loader.h',
+        'browser/extensions/external_provider_impl.cc',
+        'browser/extensions/external_provider_impl.h',
+        'browser/extensions/external_provider_interface.h',
+        'browser/extensions/external_registry_loader_win.cc',
+        'browser/extensions/external_registry_loader_win.h',
+        'browser/extensions/image_loader.cc',
+        'browser/extensions/image_loader.h',
+        'browser/extensions/image_loader_factory.cc',
+        'browser/extensions/image_loader_factory.h',
+        'browser/extensions/installed_loader.cc',
+        'browser/extensions/installed_loader.h',
+        'browser/extensions/install_observer.h',
+        'browser/extensions/install_tracker.cc',
+        'browser/extensions/install_tracker.h',
+        'browser/extensions/install_tracker_factory.cc',
+        'browser/extensions/install_tracker_factory.h',
+        'browser/extensions/lazy_background_task_queue.cc',
+        'browser/extensions/lazy_background_task_queue.h',
+        'browser/extensions/location_bar_controller.h',
+        'browser/extensions/management_policy.cc',
+        'browser/extensions/management_policy.h',
+        'browser/extensions/menu_manager.cc',
+        'browser/extensions/menu_manager.h',
+        'browser/extensions/message_handler.cc',
+        'browser/extensions/message_handler.h',
+        'browser/extensions/navigation_observer.cc',
+        'browser/extensions/navigation_observer.h',
+        'browser/extensions/pack_extension_job.cc',
+        'browser/extensions/pack_extension_job.h',
+        'browser/extensions/page_action_controller.cc',
+        'browser/extensions/page_action_controller.h',
+        'browser/extensions/pending_extension_info.cc',
+        'browser/extensions/pending_extension_info.h',
+        'browser/extensions/pending_extension_manager.cc',
+        'browser/extensions/pending_extension_manager.h',
+        'browser/extensions/permissions_updater.cc',
+        'browser/extensions/permissions_updater.h',
+        'browser/extensions/plugin_manager.cc',
+        'browser/extensions/plugin_manager.h',
+        'browser/extensions/process_map.cc',
+        'browser/extensions/process_map.h',
+        'browser/extensions/requirements_checker.cc',
+        'browser/extensions/requirements_checker.h',
+        'browser/extensions/sandboxed_unpacker.cc',
+        'browser/extensions/sandboxed_unpacker.h',
+        'browser/extensions/script_badge_controller.cc',
+        'browser/extensions/script_badge_controller.h',
+        'browser/extensions/script_bubble_controller.cc',
+        'browser/extensions/script_bubble_controller.h',
+        'browser/extensions/script_executor.cc',
+        'browser/extensions/script_executor.h',
+        'browser/extensions/standard_management_policy_provider.cc',
+        'browser/extensions/standard_management_policy_provider.h',
+        'browser/extensions/startup_helper.cc',
+        'browser/extensions/startup_helper.h',
+        'browser/extensions/state_store.cc',
+        'browser/extensions/state_store.h',
+        'browser/extensions/suggest_permission_util.h',
+        'browser/extensions/suggest_permission_util.cc',
+        'browser/extensions/api/system_info/system_info_api.cc',
+        'browser/extensions/api/system_info/system_info_api.h',
+        'browser/extensions/api/system_info/system_info_provider.cc',
+        'browser/extensions/api/system_info/system_info_provider.h',
+        'browser/extensions/api/system_private/system_private_api.cc',
+        'browser/extensions/api/system_private/system_private_api.h',
+        'browser/extensions/tab_helper.cc',
+        'browser/extensions/tab_helper.h',
+        'browser/extensions/theme_installed_infobar_delegate.cc',
+        'browser/extensions/theme_installed_infobar_delegate.h',
+        'browser/extensions/unpacked_installer.cc',
+        'browser/extensions/unpacked_installer.h',
+        'browser/extensions/update_observer.h',
+        'browser/extensions/updater/extension_downloader.cc',
+        'browser/extensions/updater/extension_downloader.h',
+        'browser/extensions/updater/extension_downloader_delegate.cc',
+        'browser/extensions/updater/extension_downloader_delegate.h',
+        'browser/extensions/updater/extension_updater.cc',
+        'browser/extensions/updater/extension_updater.h',
+        'browser/extensions/updater/manifest_fetch_data.cc',
+        'browser/extensions/updater/manifest_fetch_data.h',
+        'browser/extensions/updater/request_queue.h',
+        'browser/extensions/updater/request_queue_impl.h',
+        'browser/extensions/updater/safe_manifest_parser.cc',
+        'browser/extensions/updater/safe_manifest_parser.h',
+        'browser/extensions/user_script_listener.cc',
+        'browser/extensions/user_script_listener.h',
+        'browser/extensions/user_script_master.cc',
+        'browser/extensions/user_script_master.h',
+        'browser/extensions/webstore_data_fetcher.cc',
+        'browser/extensions/webstore_data_fetcher.h',
+        'browser/extensions/webstore_data_fetcher_delegate.h',
+        'browser/extensions/webstore_inline_installer.cc',
+        'browser/extensions/webstore_inline_installer.h',
+        'browser/extensions/webstore_install_helper.cc',
+        'browser/extensions/webstore_install_helper.h',
+        'browser/extensions/webstore_installer.cc',
+        'browser/extensions/webstore_installer.h',
+        'browser/extensions/webstore_standalone_installer.cc',
+        'browser/extensions/webstore_standalone_installer.h',
+        'browser/extensions/webstore_startup_installer.cc',
+        'browser/extensions/webstore_startup_installer.h',
+        'browser/extensions/window_controller.cc',
+        'browser/extensions/window_controller.h',
+        'browser/extensions/window_controller_list.cc',
+        'browser/extensions/window_controller_list.h',
+        'browser/extensions/window_controller_list_observer.h',
+      ],
+      'conditions': [
+        ['chromeos==1', {
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../chromeos/ime/input_method.gyp:gencode',
+            '../third_party/libevent/libevent.gyp:libevent',
+            'contacts_proto',
+          ],
+          'sources!': [
+            'browser/extensions/api/audio/audio_service.cc',
+            'browser/extensions/api/diagnostics/diagnostics_api_nonchromeos.cc',
+            'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc',
+            'browser/extensions/api/log_private/log_private_api_nonchromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
+            'browser/extensions/default_apps.cc',
+            'browser/extensions/default_apps.h',
+          ],
+          'sources': [
+            'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc',
+            'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h',
+            'browser/extensions/api/input_ime/input_ime_api.cc',
+            'browser/extensions/api/input_ime/input_ime_api.h',
+            'browser/extensions/api/log_private/log_private_api_chromeos.cc',
+            'browser/extensions/api/rtc_private/rtc_private_api.cc',
+            'browser/extensions/api/rtc_private/rtc_private_api.h',
+            'browser/extensions/api/terminal/terminal_extension_helper.cc',
+            'browser/extensions/api/terminal/terminal_extension_helper.h',
+            'browser/extensions/api/terminal/terminal_private_api.cc',
+            'browser/extensions/api/terminal/terminal_private_api.h',
+          ],
+        }],
+        ['use_ash==1', {
+          'sources': [
+            'browser/extensions/api/tabs/ash_panel_contents.cc',
+            'browser/extensions/api/tabs/ash_panel_contents.h',
+          ],
+        }],
+        ['enable_extensions==0', {
+          'sources/': [
+            # Handle files in browser/extensions/api. Exclude everything by default, white list
+            # files if they are needed for linking.
+            # TODO: The re-includes should go away or shrink as extensions are refactored to be
+            # less intertwined in the main codebase.
+            ['exclude', '^browser/extensions/api/'],
+            ['exclude', '^browser/extensions/.*_api\.cc$'],
+            ['include', '^browser/extensions/api/activity_log_private/activity_log_private_api.cc'],
+            ['include', '^browser/extensions/api/activity_log_private/activity_log_private_api.h'],
+            ['include', '^browser/extensions/api/alarms/alarm_manager.cc'],
+            ['include', '^browser/extensions/api/content_settings/content_settings_api_constants.cc'],
+            ['include', '^browser/extensions/api/content_settings/content_settings_helpers.cc'],
+            ['include', '^browser/extensions/api/content_settings/content_settings_store.cc'],
+            ['include', '^browser/extensions/api/declarative/initializing_rules_registry.cc'],
+            ['include', '^browser/extensions/api/declarative/rules_registry_service.cc'],
+            ['include', '^browser/extensions/api/declarative/rules_registry_with_cache.cc'],
+            ['include', '^browser/extensions/api/declarative/substring_set_matcher.cc'],
+            ['include', '^browser/extensions/api/declarative/url_matcher.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/request_stage.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_action.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_condition.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_constants.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc'],
+            ['include', '^browser/extensions/api/extension_action/extension_action_api.cc'],
+            ['include', '^browser/extensions/api/extension_action/extension_page_actions_api_constants.cc'],
+            ['include', '^browser/extensions/api/file_handlers/app_file_handler_util.cc'],
+            ['include', '^browser/extensions/api/location/location_manager.cc'],
+            ['include', '^browser/extensions/api/messaging/extension_message_port.cc'],
+            ['include', '^browser/extensions/api/messaging/message_service.cc'],
+            ['include', '^browser/extensions/api/module/module.cc'],
+            ['include', '^browser/extensions/api/omnibox/omnibox_api.cc'],
+            ['include', '^browser/extensions/api/preference/chrome_direct_setting.cc'],
+            ['include', '^browser/extensions/api/preference/chrome_direct_setting_api.cc'],
+            ['include', '^browser/extensions/api/preference/preference_api.cc'],
+            ['include', '^browser/extensions/api/processes/processes_api.cc'],
+            ['include', '^browser/extensions/api/processes/processes_api_constants.cc'],
+            ['include', '^browser/extensions/api/proxy/proxy_api.cc'],
+            ['include', '^browser/extensions/api/proxy/proxy_api_constants.cc'],
+            ['include', '^browser/extensions/api/push_messaging/push_messaging_api.cc'],
+            ['include', '^browser/extensions/api/runtime/runtime_api.cc'],
+            ['include', '^browser/extensions/api/storage/.*\.cc'],
+            ['include', '^browser/extensions/api/system_cpu/cpu_info_provider.cc'],
+            ['include', '^browser/extensions/api/system_storage/storage_info_provider.cc'],
+            ['include', '^browser/extensions/api/tabs/tabs_constants.cc'],
+            ['include', '^browser/extensions/api/web_navigation/frame_navigation_state.cc'],
+            ['include', '^browser/extensions/api/web_navigation/web_navigation_api.cc'],
+            ['include', '^browser/extensions/api/web_navigation/web_navigation_api_constants.cc'],
+            ['include', '^browser/extensions/api/web_navigation/web_navigation_api_helpers.cc'],
+            ['include', '^browser/extensions/api/web_request/form_data_parser.cc'],
+            ['include', '^browser/extensions/api/web_request/upload_data_presenter.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_api.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_api_constants.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_api_helpers.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_permissions.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_time_tracker.cc'],
+          ],
+          'dependencies!': [
+            '../device/bluetooth/bluetooth.gyp:device_bluetooth',
+            '../third_party/libusb/libusb.gyp:libusb'
+          ],
+        }],
+        ['use_aura==1', {
+          'dependencies': [
+            '../ui/keyboard/keyboard.gyp:keyboard',
+            '../ui/keyboard/keyboard.gyp:keyboard_resources',
+          ],
+        }],
+        ['OS=="linux" and use_aura==1', {
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../build/linux/system.gyp:fontconfig',
+            '../build/linux/system.gyp:x11',
+            '../dbus/dbus.gyp:dbus',
+          ],
+        }],
+        ['safe_browsing==1', {
+          'defines': [
+            'FULL_SAFE_BROWSING',
+          ],
+        }],
+        ['safe_browsing==2', {
+          'defines': [
+            'MOBILE_SAFE_BROWSING',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../build/linux/system.gyp:gconf',
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:gtkprint',
+            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:x11',
+            '../dbus/dbus.gyp:dbus',
+            '../third_party/undoview/undoview.gyp:undoview',
+          ],
+        }],
+        ['configuration_policy==1', {
+          'dependencies': [
+            'app/policy/cloud_policy_codegen.gyp:policy',
+          ],
+        }, {  # configuration_policy==0
+          'sources!': [
+            'browser/extensions/api/storage/managed_value_store_cache.cc',
+            'browser/extensions/api/storage/managed_value_store_cache.h',
+            'browser/extensions/api/storage/policy_value_store.cc',
+            'browser/extensions/api/storage/policy_value_store.h',
+          ],
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            'launcher_support',
+            '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+            '../third_party/isimpledom/isimpledom.gyp:isimpledom',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+        }, {  # 'OS!="win"
+          'conditions': [
+            ['OS=="linux" and toolkit_views==1',{
+              'include_dirs': [
+                '<(INTERMEDIATE_DIR)',
+                '<(INTERMEDIATE_DIR)/chrome',
+              ],
+              'sources/': [
+                # Other excluded stuff.
+                ['exclude', '^browser/extensions/extension_host_mac.h'],
+                ['exclude', '^browser/extensions/extension_host_mac.mm'],
+                ['exclude', '^browser/extensions/external_registry_loader_win.cc'],
+                ['exclude', '^browser/extensions/external_registry_loader_win.h'],
+              ],
+            }],
+            ['chromeos==1',{
+              'dependencies': [
+                '../dbus/dbus.gyp:dbus',
+                '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+                '../third_party/protobuf/protobuf.gyp:protoc#host',
+              ],
+            }],
+          ],
+        }],
+        ['OS=="android"', {
+          'sources': [
+            'browser/extensions/extension_error_ui_android.cc',
+            'browser/extensions/extension_error_ui_android.h',
+            'browser/extensions/extension_tab_util_android.cc',
+          ],
+          'sources!': [
+            'browser/extensions/extension_error_ui_default.cc',
+            'browser/extensions/extension_error_ui_default.h',
+            'browser/extensions/extension_tab_util.cc',
+          ],
+        }],
+        ['chrome_multiple_dll!=1', {
+          'dependencies': [
+            '../webkit/support/webkit_support.gyp:glue',
+          ],
+        }],
+      ],
+    },
+  ],
+  'conditions': [
+    ['chromeos==1', {
+      'targets': [
+        {
+          # Protobuf compiler / generator for contacts-related protocol buffers.
+          'target_name': 'contacts_proto',
+          'type': 'static_library',
+          'sources': [ 'browser/chromeos/contacts/contact.proto' ],
+          'variables': {
+            'proto_in_dir': 'browser/chromeos/contacts',
+            'proto_out_dir': 'chrome/browser/chromeos/contacts',
+          },
+          'includes': [ '../build/protoc.gypi' ]
+        },
+      ],
+    },],  # 'chromeos=1'
+  ],  # 'conditions'
+}
diff --git a/chromium/chrome/chrome_browser_ui.gypi b/chromium/chrome/chrome_browser_ui.gypi
new file mode 100644
index 00000000000..da33a8efeeb
--- /dev/null
+++ b/chromium/chrome/chrome_browser_ui.gypi
@@ -0,0 +1,3124 @@
+# Copyright 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'browser_ui',
+      'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      # Since browser and browser_ui actually depend on each other,
+      # we must omit the dependency from browser_ui to browser.
+      # However, this means browser_ui and browser should more or less
+      # have the same dependencies. Once browser_ui is untangled from
+      # browser, then we can clean up these dependencies.
+      'dependencies': [
+        # NOTE: New dependencies should generally be added in the OS!="ios"
+        # dependencies block below, rather than here.
+        'cert_logger_proto',
+        'chrome_browser_ui_views.gyp:browser_ui_views',
+        'chrome_resources.gyp:chrome_extra_resources',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:platform_locale_settings',
+        'chrome_resources.gyp:theme_resources',
+        'common',
+        'common_net',
+        'in_memory_url_index_cache_proto',
+        'safe_browsing_proto',
+        'safe_browsing_report_proto',
+        'feedback_proto',
+        'variations_seed_proto',
+        '../components/components.gyp:auto_login_parser',
+        '../content/content.gyp:content_browser',
+        '../content/content.gyp:content_common',
+        '../crypto/crypto.gyp:crypto',
+        '../media/media.gyp:media',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/libusb/libusb.gyp:libusb',
+        '../third_party/libxml/libxml.gyp:libxml',
+        '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/message_center/message_center.gyp:message_center',
+        '../ui/native_theme/native_theme.gyp:native_theme',
+        '../ui/snapshot/snapshot.gyp:snapshot',
+        '../ui/ui.gyp:ui',
+        '../ui/ui.gyp:ui_resources',
+        '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+      ],
+      'include_dirs': [
+        '..',
+        '<(INTERMEDIATE_DIR)',
+        # Needed by pepper_flash_component_installer.cc.
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
+      'export_dependent_settings': [
+        '../sync/sync.gyp:sync',
+      ],
+      'sources': [
+        # All .cc, .h, .m, and .mm files under browser/ui except for:
+        # * tests and mocks.
+        'browser/ui/accelerator_utils.h',
+        'browser/ui/active_tab_tracker.cc',
+        'browser/ui/active_tab_tracker.h',
+        'browser/ui/alternate_error_tab_observer.cc',
+        'browser/ui/alternate_error_tab_observer.h',
+        'browser/ui/android/android_about_app_info.cc',
+        'browser/ui/android/android_about_app_info.h',
+        'browser/ui/android/autofill/autofill_dialog_controller_android.cc',
+        'browser/ui/android/autofill/autofill_dialog_controller_android.h',
+        'browser/ui/android/autofill/autofill_dialog_result.cc',
+        'browser/ui/android/autofill/autofill_dialog_result.h',
+        'browser/ui/android/autofill/autofill_popup_view_android.cc',
+        'browser/ui/android/autofill/autofill_popup_view_android.h',
+        'browser/ui/android/certificate_viewer_android.cc',
+        'browser/ui/android/chrome_http_auth_handler.cc',
+        'browser/ui/android/chrome_http_auth_handler.h',
+        'browser/ui/android/color_chooser_dialog_android.cc',
+        'browser/ui/android/extensions/extension_install_dialog_android.cc',
+        'browser/ui/android/extensions/extension_install_ui_android.cc',
+        'browser/ui/android/extensions/extension_install_ui_android.h',
+        'browser/ui/android/extensions/extension_view_android.cc',
+        'browser/ui/android/extensions/extension_view_android.h',
+        'browser/ui/android/external_protocol_dialog_android.cc',
+        'browser/ui/android/javascript_app_modal_dialog_android.cc',
+        'browser/ui/android/login_prompt_android.cc',
+        'browser/ui/android/navigation_popup.cc',
+        'browser/ui/android/navigation_popup.h',
+        'browser/ui/android/simple_message_box_android.cc',
+        'browser/ui/android/ssl_client_certificate_request.cc',
+        'browser/ui/android/ssl_client_certificate_request.h',
+        'browser/ui/android/status_tray_android.cc',
+        'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc',
+        'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h',
+        'browser/ui/android/tab_model/tab_model.cc',
+        'browser/ui/android/tab_model/tab_model.h',
+        'browser/ui/android/tab_model/tab_model_list.cc',
+        'browser/ui/android/tab_model/tab_model_list.h',
+        'browser/ui/android/tab_restore_service_delegate_android.cc',
+        'browser/ui/android/validation_message_bubble_android.h',
+        'browser/ui/android/validation_message_bubble_android.cc',
+        'browser/ui/android/website_settings_popup_android.cc',
+        'browser/ui/android/website_settings_popup_android.h',
+        'browser/ui/android/window_android_helper.cc',
+        'browser/ui/android/window_android_helper.h',
+        'browser/ui/app_list/app_context_menu.cc',
+        'browser/ui/app_list/app_context_menu.h',
+        'browser/ui/app_list/app_context_menu_delegate.h',
+        'browser/ui/app_list/app_list_controller_delegate.cc',
+        'browser/ui/app_list/app_list_controller_delegate.h',
+        'browser/ui/app_list/app_list_service.cc',
+        'browser/ui/app_list/app_list_service.h',
+        'browser/ui/app_list/app_list_service_ash.h',
+        'browser/ui/app_list/app_list_service_disabled.cc',
+        'browser/ui/app_list/app_list_service_impl.cc',
+        'browser/ui/app_list/app_list_service_impl.h',
+        'browser/ui/app_list/app_list_service_mac.mm',
+        'browser/ui/app_list/app_list_service_win.cc',
+        'browser/ui/app_list/app_list_service_win.h',
+        'browser/ui/app_list/app_list_view_delegate.cc',
+        'browser/ui/app_list/app_list_view_delegate.h',
+        'browser/ui/app_list/apps_model_builder.cc',
+        'browser/ui/app_list/apps_model_builder.h',
+        'browser/ui/app_list/chrome_app_list_item.h',
+        'browser/ui/app_list/chrome_signin_delegate.cc',
+        'browser/ui/app_list/chrome_signin_delegate.h',
+        'browser/ui/app_list/extension_app_item.cc',
+        'browser/ui/app_list/extension_app_item.h',
+        'browser/ui/app_list/search/app_result.cc',
+        'browser/ui/app_list/search/app_result.h',
+        'browser/ui/app_list/search/app_search_provider.cc',
+        'browser/ui/app_list/search/app_search_provider.h',
+        'browser/ui/app_list/search/chrome_search_result.h',
+        'browser/ui/app_list/search/history.cc',
+        'browser/ui/app_list/search/history.h',
+        'browser/ui/app_list/search/history_data.cc',
+        'browser/ui/app_list/search/history_data.h',
+        'browser/ui/app_list/search/history_data_store.cc',
+        'browser/ui/app_list/search/history_data_store.h',
+        'browser/ui/app_list/search/history_factory.cc',
+        'browser/ui/app_list/search/history_factory.h',
+        'browser/ui/app_list/search/history_types.h',
+        'browser/ui/app_list/search/mixer.cc',
+        'browser/ui/app_list/search/mixer.h',
+        'browser/ui/app_list/search/omnibox_provider.cc',
+        'browser/ui/app_list/search/omnibox_provider.h',
+        'browser/ui/app_list/search/search_controller.cc',
+        'browser/ui/app_list/search/search_controller.h',
+        'browser/ui/app_list/search/search_provider.cc',
+        'browser/ui/app_list/search/search_provider.h',
+        'browser/ui/app_list/search/search_webstore_result.cc',
+        'browser/ui/app_list/search/search_webstore_result.h',
+        'browser/ui/app_list/search/term_break_iterator.cc',
+        'browser/ui/app_list/search/term_break_iterator.h',
+        'browser/ui/app_list/search/tokenized_string.cc',
+        'browser/ui/app_list/search/tokenized_string.h',
+        'browser/ui/app_list/search/tokenized_string_char_iterator.cc',
+        'browser/ui/app_list/search/tokenized_string_char_iterator.h',
+        'browser/ui/app_list/search/tokenized_string_match.cc',
+        'browser/ui/app_list/search/tokenized_string_match.h',
+        'browser/ui/app_list/search/webstore_installer.cc',
+        'browser/ui/app_list/search/webstore_installer.h',
+        'browser/ui/app_list/search/webstore_provider.cc',
+        'browser/ui/app_list/search/webstore_provider.h',
+        'browser/ui/app_list/search/webstore_result.cc',
+        'browser/ui/app_list/search/webstore_result.h',
+        'browser/ui/app_list/search/webstore_result_icon_source.cc',
+        'browser/ui/app_list/search/webstore_result_icon_source.h',
+        'browser/ui/app_list/search/webstore_search_fetcher.cc',
+        'browser/ui/app_list/search/webstore_search_fetcher.h',
+        'browser/ui/app_modal_dialogs/app_modal_dialog.cc',
+        'browser/ui/app_modal_dialogs/app_modal_dialog.h',
+        'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc',
+        'browser/ui/app_modal_dialogs/app_modal_dialog_queue.h',
+        'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc',
+        'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h',
+        'browser/ui/app_modal_dialogs/javascript_dialog_manager.cc',
+        'browser/ui/app_modal_dialogs/javascript_dialog_manager.h',
+        'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
+        'browser/ui/apps/app_metro_infobar_delegate_win.cc',
+        'browser/ui/apps/app_metro_infobar_delegate_win.h',
+        'browser/ui/apps/apps_metro_handler_win.cc',
+        'browser/ui/apps/apps_metro_handler_win.h',
+        'browser/ui/apps/chrome_shell_window_delegate.cc',
+        'browser/ui/apps/chrome_shell_window_delegate.h',
+        'browser/ui/ash/ash_keyboard_controller_proxy.cc',
+        'browser/ui/ash/ash_keyboard_controller_proxy.h',
+        'browser/ui/ash/app_list/app_list_controller_ash.h',
+        'browser/ui/ash/app_list/app_list_controller_ash.cc',
+        'browser/ui/ash/app_list/app_list_service_ash.cc',
+        'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc',
+        'browser/ui/ash/app_list/app_sync_ui_state_watcher.h',
+        'browser/ui/ash/app_sync_ui_state.cc',
+        'browser/ui/ash/app_sync_ui_state.h',
+        'browser/ui/ash/app_sync_ui_state_observer.h',
+        'browser/ui/ash/app_sync_ui_state_factory.cc',
+        'browser/ui/ash/app_sync_ui_state_factory.h',
+        'browser/ui/ash/ash_init.cc',
+        'browser/ui/ash/ash_init.h',
+        'browser/ui/ash/ash_util.cc',
+        'browser/ui/ash/ash_util.h',
+        'browser/ui/ash/caps_lock_delegate_chromeos.cc',
+        'browser/ui/ash/caps_lock_delegate_chromeos.h',
+        'browser/ui/ash/caps_lock_delegate_views.cc',
+        'browser/ui/ash/caps_lock_delegate_views.h',
+        'browser/ui/ash/brightness_controller_chromeos.cc',
+        'browser/ui/ash/brightness_controller_chromeos.h',
+        'browser/ui/ash/chrome_launcher_prefs.cc',
+        'browser/ui/ash/chrome_launcher_prefs.h',
+        'browser/ui/ash/chrome_shell_delegate.cc',
+        'browser/ui/ash/chrome_shell_delegate.h',
+        'browser/ui/ash/chrome_shell_delegate_chromeos.cc',
+        'browser/ui/ash/chrome_shell_delegate_views.cc',
+        'browser/ui/ash/event_rewriter.cc',
+        'browser/ui/ash/event_rewriter.h',
+        'browser/ui/ash/ime_controller_chromeos.cc',
+        'browser/ui/ash/ime_controller_chromeos.h',
+        'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc',
+        'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h',
+        'browser/ui/ash/launcher/browser_launcher_item_controller.cc',
+        'browser/ui/ash/launcher/browser_launcher_item_controller.h',
+        'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc',
+        'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h',
+        'browser/ui/ash/launcher/chrome_launcher_app_menu_item.cc',
+        'browser/ui/ash/launcher/chrome_launcher_app_menu_item.h',
+        'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc',
+        'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h',
+        'browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc',
+        'browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h',
+        'browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc',
+        'browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h',
+        'browser/ui/ash/launcher/chrome_launcher_controller.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller.h',
+        'browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller_per_app.h',
+        'browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h',
+        'browser/ui/ash/launcher/launcher_app_tab_helper.cc',
+        'browser/ui/ash/launcher/launcher_app_tab_helper.h',
+        'browser/ui/ash/launcher/launcher_context_menu.cc',
+        'browser/ui/ash/launcher/launcher_context_menu.h',
+        'browser/ui/ash/launcher/launcher_favicon_loader.cc',
+        'browser/ui/ash/launcher/launcher_favicon_loader.h',
+        'browser/ui/ash/launcher/launcher_item_controller.cc',
+        'browser/ui/ash/launcher/launcher_item_controller.h',
+        'browser/ui/ash/launcher/launcher_application_menu_item_model.cc',
+        'browser/ui/ash/launcher/launcher_application_menu_item_model.h',
+        'browser/ui/ash/launcher/shell_window_launcher_item_controller.cc',
+        'browser/ui/ash/launcher/shell_window_launcher_item_controller.h',
+        'browser/ui/ash/launcher/shell_window_launcher_controller.cc',
+        'browser/ui/ash/launcher/shell_window_launcher_controller.h',
+        'browser/ui/ash/screenshot_taker.cc',
+        'browser/ui/ash/screenshot_taker.h',
+        'browser/ui/ash/session_state_delegate_chromeos.cc',
+        'browser/ui/ash/session_state_delegate_chromeos.h',
+        'browser/ui/ash/session_state_delegate_views.cc',
+        'browser/ui/ash/session_state_delegate_views.h',
+        'browser/ui/ash/tabs/dock_info_ash.cc',
+        'browser/ui/ash/tabs/dock_info_ash.h',
+        'browser/ui/ash/tabs/dock_info_chromeos.cc',
+        'browser/ui/ash/user_action_handler.cc',
+        'browser/ui/ash/user_action_handler.h',
+        'browser/ui/ash/user_wallpaper_delegate_win.cc',
+        'browser/ui/ash/user_wallpaper_delegate_win.h',
+        'browser/ui/ash/volume_controller_chromeos.cc',
+        'browser/ui/ash/volume_controller_chromeos.h',
+        'browser/ui/ash/window_positioner.cc',
+        'browser/ui/ash/window_positioner.h',
+        'browser/ui/aura/active_desktop_monitor.cc',
+        'browser/ui/aura/active_desktop_monitor.h',
+        'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc',
+        'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
+        'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
+        'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
+        'browser/ui/aura/tabs/dock_info_aurax11.cc',
+        'browser/ui/autofill/account_chooser_model.cc',
+        'browser/ui/autofill/account_chooser_model.h',
+        'browser/ui/autofill/autocheckout_bubble.h',
+        'browser/ui/autofill/autocheckout_bubble.cc',
+        'browser/ui/autofill/autocheckout_bubble_controller.cc',
+        'browser/ui/autofill/autocheckout_bubble_controller.h',
+        'browser/ui/autofill/autofill_dialog_common.cc',
+        'browser/ui/autofill/autofill_dialog_common.h',
+        'browser/ui/autofill/autofill_dialog_controller.cc',
+        'browser/ui/autofill/autofill_dialog_controller.h',
+        'browser/ui/autofill/autofill_dialog_controller_impl.cc',
+        'browser/ui/autofill/autofill_dialog_controller_impl.h',
+        'browser/ui/autofill/autofill_dialog_models.cc',
+        'browser/ui/autofill/autofill_dialog_models.h',
+        'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc',
+        'browser/ui/autofill/autofill_dialog_sign_in_delegate.h',
+        'browser/ui/autofill/autofill_dialog_types.cc',
+        'browser/ui/autofill/autofill_dialog_types.h',
+        'browser/ui/autofill/autofill_dialog_view.cc',
+        'browser/ui/autofill/autofill_dialog_view.h',
+        'browser/ui/autofill/autofill_dialog_view_delegate.h',
+        'browser/ui/autofill/autofill_popup_controller.h',
+        'browser/ui/autofill/autofill_popup_controller_impl.cc',
+        'browser/ui/autofill/autofill_popup_controller_impl.h',
+        'browser/ui/autofill/autofill_popup_view.h',
+        'browser/ui/autofill/country_combobox_model.cc',
+        'browser/ui/autofill/country_combobox_model.h',
+        'browser/ui/autofill/data_model_wrapper.cc',
+        'browser/ui/autofill/data_model_wrapper.h',
+        'browser/ui/autofill/generated_credit_card_bubble_view.cc',
+        'browser/ui/autofill/generated_credit_card_bubble_view.h',
+        'browser/ui/autofill/generated_credit_card_bubble_controller.cc',
+        'browser/ui/autofill/generated_credit_card_bubble_controller.h',
+        'browser/ui/autofill/new_credit_card_bubble_view.cc',
+        'browser/ui/autofill/new_credit_card_bubble_view.h',
+        'browser/ui/autofill/new_credit_card_bubble_controller.cc',
+        'browser/ui/autofill/new_credit_card_bubble_controller.h',
+        'browser/ui/autofill/tab_autofill_manager_delegate.cc',
+        'browser/ui/autofill/tab_autofill_manager_delegate.h',
+        'browser/ui/auto_login_infobar_delegate.cc',
+        'browser/ui/auto_login_infobar_delegate.h',
+        'browser/ui/auto_login_infobar_delegate_android.h',
+        'browser/ui/auto_login_prompter.cc',
+        'browser/ui/auto_login_prompter.h',
+        'browser/ui/blocked_content/blocked_content_container.cc',
+        'browser/ui/blocked_content/blocked_content_container.h',
+        'browser/ui/blocked_content/blocked_content_tab_helper.cc',
+        'browser/ui/blocked_content/blocked_content_tab_helper.h',
+        'browser/ui/blocked_content/blocked_content_tab_helper_delegate.cc',
+        'browser/ui/blocked_content/blocked_content_tab_helper_delegate.h',
+        'browser/ui/blocked_content/popup_blocker_tab_helper.cc',
+        'browser/ui/blocked_content/popup_blocker_tab_helper.h',
+        'browser/ui/bookmarks/bookmark_bar.h',
+        'browser/ui/bookmarks/bookmark_bar_constants.h',
+        'browser/ui/bookmarks/bookmark_bar_instructions_delegate.h',
+        'browser/ui/bookmarks/bookmark_bubble_delegate.h',
+        'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc',
+        'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h',
+        'browser/ui/bookmarks/bookmark_context_menu_controller.cc',
+        'browser/ui/bookmarks/bookmark_context_menu_controller.h',
+        'browser/ui/bookmarks/bookmark_drag_drop.cc',
+        'browser/ui/bookmarks/bookmark_drag_drop.h',
+        'browser/ui/bookmarks/bookmark_editor.cc',
+        'browser/ui/bookmarks/bookmark_editor.h',
+        'browser/ui/bookmarks/bookmark_prompt_controller.cc',
+        'browser/ui/bookmarks/bookmark_prompt_controller.h',
+        'browser/ui/bookmarks/bookmark_tab_helper.cc',
+        'browser/ui/bookmarks/bookmark_tab_helper.h',
+        'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc',
+        'browser/ui/bookmarks/bookmark_tab_helper_delegate.h',
+        'browser/ui/bookmarks/bookmark_utils.cc',
+        'browser/ui/bookmarks/bookmark_utils.h',
+        'browser/ui/bookmarks/recently_used_folders_combo_model.cc',
+        'browser/ui/bookmarks/recently_used_folders_combo_model.h',
+        'browser/ui/browser.cc',
+        'browser/ui/browser.h',
+        'browser/ui/browser_commands.cc',
+        'browser/ui/browser_commands.h',
+        'browser/ui/browser_commands_mac.cc',
+        'browser/ui/browser_commands_mac.h',
+        'browser/ui/browser_command_controller.cc',
+        'browser/ui/browser_command_controller.h',
+        'browser/ui/browser_content_setting_bubble_model_delegate.cc',
+        'browser/ui/browser_content_setting_bubble_model_delegate.h',
+        'browser/ui/browser_dialogs.h',
+        'browser/ui/browser_finder.cc',
+        'browser/ui/browser_finder.h',
+        'browser/ui/browser_instant_controller.cc',
+        'browser/ui/browser_instant_controller.h',
+        'browser/ui/browser_iterator.cc',
+        'browser/ui/browser_iterator.h',
+        'browser/ui/browser_list.cc',
+        'browser/ui/browser_list.h',
+        'browser/ui/browser_mac.cc',
+        'browser/ui/browser_mac.h',
+        'browser/ui/browser_navigator.cc',
+        'browser/ui/browser_navigator.h',
+        'browser/ui/browser_otr_state_android.cc',
+        'browser/ui/browser_otr_state.cc',
+        'browser/ui/browser_otr_state.h',
+        'browser/ui/browser_ui_prefs.cc',
+        'browser/ui/browser_ui_prefs.h',
+        'browser/ui/browser_tab_contents.h',
+        'browser/ui/browser_tab_contents.cc',
+        'browser/ui/browser_tab_restore_service_delegate.cc',
+        'browser/ui/browser_tab_restore_service_delegate.h',
+        'browser/ui/browser_tab_strip_model_delegate.cc',
+        'browser/ui/browser_tab_strip_model_delegate.h',
+        'browser/ui/browser_tabrestore.cc',
+        'browser/ui/browser_tabrestore.h',
+        'browser/ui/browser_tabstrip.cc',
+        'browser/ui/browser_tabstrip.h',
+        'browser/ui/browser_toolbar_model_delegate.cc',
+        'browser/ui/browser_toolbar_model_delegate.h',
+        'browser/ui/browser_view_prefs.cc',
+        'browser/ui/browser_view_prefs.h',
+        'browser/ui/browser_win.cc',
+        'browser/ui/browser_window.h',
+        'browser/ui/browser_window_state.cc',
+        'browser/ui/browser_window_state.h',
+        'browser/ui/certificate_dialogs.cc',
+        'browser/ui/certificate_dialogs.h',
+        'browser/ui/chrome_pages.cc',
+        'browser/ui/chrome_pages.h',
+        'browser/ui/chrome_select_file_policy.cc',
+        'browser/ui/chrome_select_file_policy.h',
+        'browser/ui/chrome_style.cc',
+        'browser/ui/chrome_style.h',
+        'browser/ui/chrome_web_modal_dialog_manager_delegate.cc',
+        'browser/ui/chrome_web_modal_dialog_manager_delegate.h',
+        'browser/ui/cocoa/accelerator_utils_cocoa.mm',
+        'browser/ui/cocoa/about_ipc_controller.h',
+        'browser/ui/cocoa/about_ipc_controller.mm',
+        'browser/ui/cocoa/about_ipc_dialog.h',
+        'browser/ui/cocoa/about_ipc_dialog.mm',
+        'browser/ui/cocoa/accelerators_cocoa.h',
+        'browser/ui/cocoa/accelerators_cocoa.mm',
+        'browser/ui/cocoa/animatable_image.h',
+        'browser/ui/cocoa/animatable_image.mm',
+        'browser/ui/cocoa/animatable_view.h',
+        'browser/ui/cocoa/animatable_view.mm',
+        'browser/ui/cocoa/applescript/apple_event_util.h',
+        'browser/ui/cocoa/applescript/apple_event_util.mm',
+        'browser/ui/cocoa/applescript/bookmark_folder_applescript.h',
+        'browser/ui/cocoa/applescript/bookmark_folder_applescript.mm',
+        'browser/ui/cocoa/applescript/bookmark_item_applescript.h',
+        'browser/ui/cocoa/applescript/bookmark_item_applescript.mm',
+        'browser/ui/cocoa/applescript/bookmark_node_applescript.h',
+        'browser/ui/cocoa/applescript/bookmark_node_applescript.mm',
+        'browser/ui/cocoa/applescript/browsercrapplication+applescript.h',
+        'browser/ui/cocoa/applescript/browsercrapplication+applescript.mm',
+        'browser/ui/cocoa/applescript/constants_applescript.h',
+        'browser/ui/cocoa/applescript/constants_applescript.mm',
+        'browser/ui/cocoa/applescript/element_applescript.h',
+        'browser/ui/cocoa/applescript/element_applescript.mm',
+        'browser/ui/cocoa/applescript/error_applescript.h',
+        'browser/ui/cocoa/applescript/error_applescript.mm',
+        'browser/ui/cocoa/applescript/tab_applescript.h',
+        'browser/ui/cocoa/applescript/tab_applescript.mm',
+        'browser/ui/cocoa/applescript/window_applescript.h',
+        'browser/ui/cocoa/applescript/window_applescript.mm',
+        'browser/ui/cocoa/apps/chrome_shell_window_delegate_cocoa.mm',
+        'browser/ui/cocoa/apps/native_app_window_cocoa.h',
+        'browser/ui/cocoa/apps/native_app_window_cocoa.mm',
+        'browser/ui/cocoa/autofill/autofill_account_chooser.h',
+        'browser/ui/cocoa/autofill/autofill_account_chooser.mm',
+        'browser/ui/cocoa/autofill/autofill_details_container.h',
+        'browser/ui/cocoa/autofill/autofill_details_container.mm',
+        'browser/ui/cocoa/autofill/autofill_dialog_cocoa.h',
+        'browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm',
+        'browser/ui/cocoa/autofill/autofill_dialog_constants.h',
+        'browser/ui/cocoa/autofill/autofill_layout.h',
+        'browser/ui/cocoa/autofill/autofill_notification_container.h',
+        'browser/ui/cocoa/autofill/autofill_notification_container.mm',
+        'browser/ui/cocoa/autofill/autofill_notification_controller.h',
+        'browser/ui/cocoa/autofill/autofill_notification_controller.mm',
+        'browser/ui/cocoa/autofill/autofill_main_container.h',
+        'browser/ui/cocoa/autofill/autofill_main_container.mm',
+        'browser/ui/cocoa/autofill/autofill_popup_view_bridge.h',
+        'browser/ui/cocoa/autofill/autofill_popup_view_bridge.mm',
+        'browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h',
+        'browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm',
+        'browser/ui/cocoa/autofill/autofill_section_container.h',
+        'browser/ui/cocoa/autofill/autofill_section_container.mm',
+        'browser/ui/cocoa/autofill/autofill_section_view.h',
+        'browser/ui/cocoa/autofill/autofill_section_view.mm',
+        'browser/ui/cocoa/autofill/autofill_sign_in_container.h',
+        'browser/ui/cocoa/autofill/autofill_sign_in_container.mm',
+        'browser/ui/cocoa/autofill/autofill_suggestion_container.h',
+        'browser/ui/cocoa/autofill/autofill_suggestion_container.mm',
+        'browser/ui/cocoa/autofill/autofill_textfield.h',
+        'browser/ui/cocoa/autofill/autofill_textfield.mm',
+        'browser/ui/cocoa/autofill/down_arrow_popup_menu_cell.h',
+        'browser/ui/cocoa/autofill/down_arrow_popup_menu_cell.mm',
+        'browser/ui/cocoa/autofill/layout_view.h',
+        'browser/ui/cocoa/autofill/layout_view.mm',
+        'browser/ui/cocoa/autofill/autofill_pop_up_button.h',
+        'browser/ui/cocoa/autofill/autofill_pop_up_button.mm',
+        'browser/ui/cocoa/autofill/simple_grid_layout.h',
+        'browser/ui/cocoa/autofill/simple_grid_layout.mm',
+        'browser/ui/cocoa/background_gradient_view.h',
+        'browser/ui/cocoa/background_gradient_view.mm',
+        'browser/ui/cocoa/base_bubble_controller.h',
+        'browser/ui/cocoa/base_bubble_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_constants.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_state.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_view.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_view.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_button.h',
+        'browser/ui/cocoa/bookmarks/bookmark_button.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_button_cell.h',
+        'browser/ui/cocoa/bookmarks/bookmark_button_cell.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.h',
+        'browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_editor_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_folder_target.h',
+        'browser/ui/cocoa/bookmarks/bookmark_folder_target.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h',
+        'browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h',
+        'browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h',
+        'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.mm',
+        'browser/ui/cocoa/browser/avatar_button_controller.h',
+        'browser/ui/cocoa/browser/avatar_button_controller.mm',
+        'browser/ui/cocoa/browser/avatar_label_button.h',
+        'browser/ui/cocoa/browser/avatar_label_button.mm',
+        'browser/ui/cocoa/browser/avatar_menu_bubble_controller.h',
+        'browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm',
+        'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h',
+        'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm',
+        'browser/ui/cocoa/browser/password_generation_bubble_controller.h',
+        'browser/ui/cocoa/browser/password_generation_bubble_controller.mm',
+        'browser/ui/cocoa/browser/zoom_bubble_controller.h',
+        'browser/ui/cocoa/browser/zoom_bubble_controller.mm',
+        'browser/ui/cocoa/browser_command_executor.h',
+        'browser/ui/cocoa/browser_window_cocoa.h',
+        'browser/ui/cocoa/browser_window_cocoa.mm',
+        'browser/ui/cocoa/browser_window_controller.h',
+        'browser/ui/cocoa/browser_window_controller.mm',
+        'browser/ui/cocoa/browser_window_controller_private.h',
+        'browser/ui/cocoa/browser_window_controller_private.mm',
+        'browser/ui/cocoa/browser_window_factory.mm',
+        'browser/ui/cocoa/browser_window_utils.h',
+        'browser/ui/cocoa/browser_window_utils.mm',
+        'browser/ui/cocoa/bubble_view.h',
+        'browser/ui/cocoa/bubble_view.mm',
+        'browser/ui/cocoa/certificate_viewer_mac.mm',
+        'browser/ui/cocoa/chrome_browser_window.h',
+        'browser/ui/cocoa/chrome_browser_window.mm',
+        'browser/ui/cocoa/chrome_event_processing_window.h',
+        'browser/ui/cocoa/chrome_event_processing_window.mm',
+        'browser/ui/cocoa/clickhold_button_cell.h',
+        'browser/ui/cocoa/clickhold_button_cell.mm',
+        'browser/ui/cocoa/color_chooser_mac.mm',
+        'browser/ui/cocoa/command_observer_bridge.h',
+        'browser/ui/cocoa/command_observer_bridge.mm',
+        'browser/ui/cocoa/confirm_bubble_cocoa.h',
+        'browser/ui/cocoa/confirm_bubble_cocoa.mm',
+        'browser/ui/cocoa/confirm_bubble_controller.h',
+        'browser/ui/cocoa/confirm_bubble_controller.mm',
+        'browser/ui/cocoa/confirm_quit.h',
+        'browser/ui/cocoa/confirm_quit_panel_controller.h',
+        'browser/ui/cocoa/confirm_quit_panel_controller.mm',
+        'browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_alert.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_alert.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_animation.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_animation.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_button.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_button.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_control_utils.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_control_utils.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_custom_window.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_custom_window.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_custom_window.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_mac.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_mac.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_sheet.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_sheet_info.mm',
+        'browser/ui/cocoa/content_settings/collected_cookies_mac.h',
+        'browser/ui/cocoa/content_settings/collected_cookies_mac.mm',
+        'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h',
+        'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm',
+        'browser/ui/cocoa/content_settings/cookie_details.h',
+        'browser/ui/cocoa/content_settings/cookie_details.mm',
+        'browser/ui/cocoa/content_settings/cookie_details_view_controller.h',
+        'browser/ui/cocoa/content_settings/cookie_details_view_controller.mm',
+        'browser/ui/cocoa/content_settings/cookie_tree_node.h',
+        'browser/ui/cocoa/content_settings/cookie_tree_node.mm',
+        'browser/ui/cocoa/custom_frame_view.h',
+        'browser/ui/cocoa/custom_frame_view.mm',
+        'browser/ui/cocoa/dev_tools_controller.h',
+        'browser/ui/cocoa/dev_tools_controller.mm',
+        'browser/ui/cocoa/dock_icon.h',
+        'browser/ui/cocoa/dock_icon.mm',
+        'browser/ui/cocoa/download/background_theme.h',
+        'browser/ui/cocoa/download/background_theme.mm',
+        'browser/ui/cocoa/download/download_item_button.h',
+        'browser/ui/cocoa/download/download_item_button.mm',
+        'browser/ui/cocoa/download/download_item_cell.h',
+        'browser/ui/cocoa/download/download_item_cell.mm',
+        'browser/ui/cocoa/download/download_item_controller.h',
+        'browser/ui/cocoa/download/download_item_controller.mm',
+        'browser/ui/cocoa/download/download_item_mac.h',
+        'browser/ui/cocoa/download/download_item_mac.mm',
+        'browser/ui/cocoa/download/download_shelf_context_menu_controller.h',
+        'browser/ui/cocoa/download/download_shelf_context_menu_controller.mm',
+        'browser/ui/cocoa/download/download_shelf_controller.h',
+        'browser/ui/cocoa/download/download_shelf_controller.mm',
+        'browser/ui/cocoa/download/download_shelf_mac.h',
+        'browser/ui/cocoa/download/download_shelf_mac.mm',
+        'browser/ui/cocoa/download/download_shelf_view.h',
+        'browser/ui/cocoa/download/download_shelf_view.mm',
+        'browser/ui/cocoa/download/download_show_all_button.h',
+        'browser/ui/cocoa/download/download_show_all_button.mm',
+        'browser/ui/cocoa/download/download_show_all_cell.h',
+        'browser/ui/cocoa/download/download_show_all_cell.mm',
+        'browser/ui/cocoa/download/download_started_animation_mac.mm',
+        'browser/ui/cocoa/download/download_util_mac.h',
+        'browser/ui/cocoa/download/download_util_mac.mm',
+        'browser/ui/cocoa/draggable_button.h',
+        'browser/ui/cocoa/draggable_button.mm',
+        'browser/ui/cocoa/draggable_button_mixin.h',
+        'browser/ui/cocoa/draggable_button_mixin.mm',
+        'browser/ui/cocoa/drag_util.h',
+        'browser/ui/cocoa/drag_util.mm',
+        'browser/ui/cocoa/encoding_menu_controller_delegate_mac.h',
+        'browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm',
+        'browser/ui/cocoa/extensions/browser_action_button.h',
+        'browser/ui/cocoa/extensions/browser_action_button.mm',
+        'browser/ui/cocoa/extensions/browser_action_test_util_mac.mm',
+        'browser/ui/cocoa/extensions/browser_actions_container_view.h',
+        'browser/ui/cocoa/extensions/browser_actions_container_view.mm',
+        'browser/ui/cocoa/extensions/browser_actions_controller.h',
+        'browser/ui/cocoa/extensions/browser_actions_controller.mm',
+        'browser/ui/cocoa/extensions/browser_actions_controller_prefs.h',
+        'browser/ui/cocoa/extensions/browser_actions_controller_prefs.cc',
+        'browser/ui/cocoa/extensions/extension_action_context_menu.h',
+        'browser/ui/cocoa/extensions/extension_action_context_menu.mm',
+        'browser/ui/cocoa/extensions/extension_install_dialog_controller.h',
+        'browser/ui/cocoa/extensions/extension_install_dialog_controller.mm',
+        'browser/ui/cocoa/extensions/extension_install_view_controller.h',
+        'browser/ui/cocoa/extensions/extension_install_view_controller.mm',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_controller.h',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm',
+        'browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h',
+        'browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm',
+        'browser/ui/cocoa/extensions/extension_popup_controller.h',
+        'browser/ui/cocoa/extensions/extension_popup_controller.mm',
+        'browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm',
+        'browser/ui/cocoa/extensions/extension_view_mac.h',
+        'browser/ui/cocoa/extensions/extension_view_mac.mm',
+        'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h',
+        'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm',
+        'browser/ui/cocoa/external_protocol_dialog.h',
+        'browser/ui/cocoa/external_protocol_dialog.mm',
+        'browser/ui/cocoa/fast_resize_view.h',
+        'browser/ui/cocoa/fast_resize_view.mm',
+        'browser/ui/cocoa/find_bar/find_bar_bridge.h',
+        'browser/ui/cocoa/find_bar/find_bar_bridge.mm',
+        'browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h',
+        'browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field.h',
+        'browser/ui/cocoa/find_bar/find_bar_text_field.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_cell.h',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm',
+        'browser/ui/cocoa/find_bar/find_bar_view.h',
+        'browser/ui/cocoa/find_bar/find_bar_view.mm',
+        'browser/ui/cocoa/first_run_bubble_controller.h',
+        'browser/ui/cocoa/first_run_bubble_controller.mm',
+        'browser/ui/cocoa/first_run_dialog.h',
+        'browser/ui/cocoa/first_run_dialog.mm',
+        'browser/ui/cocoa/floating_bar_backing_view.h',
+        'browser/ui/cocoa/floating_bar_backing_view.mm',
+        'browser/ui/cocoa/framed_browser_window.h',
+        'browser/ui/cocoa/framed_browser_window.mm',
+        'browser/ui/cocoa/fullscreen_exit_bubble_controller.h',
+        'browser/ui/cocoa/fullscreen_exit_bubble_controller.mm',
+        'browser/ui/cocoa/fullscreen_exit_bubble_view.h',
+        'browser/ui/cocoa/fullscreen_exit_bubble_view.mm',
+        'browser/ui/cocoa/fullscreen_mode_controller.h',
+        'browser/ui/cocoa/fullscreen_mode_controller.mm',
+        'browser/ui/cocoa/fullscreen_window.h',
+        'browser/ui/cocoa/fullscreen_window.mm',
+        'browser/ui/cocoa/global_error_bubble_controller.h',
+        'browser/ui/cocoa/global_error_bubble_controller.mm',
+        'browser/ui/cocoa/gradient_button_cell.h',
+        'browser/ui/cocoa/gradient_button_cell.mm',
+        'browser/ui/cocoa/history_menu_bridge.h',
+        'browser/ui/cocoa/history_menu_bridge.mm',
+        'browser/ui/cocoa/history_menu_cocoa_controller.h',
+        'browser/ui/cocoa/history_menu_cocoa_controller.mm',
+        'browser/ui/cocoa/history_overlay_controller.h',
+        'browser/ui/cocoa/history_overlay_controller.mm',
+        'browser/ui/cocoa/hover_close_button.h',
+        'browser/ui/cocoa/hover_close_button.mm',
+        'browser/ui/cocoa/hung_renderer_controller.h',
+        'browser/ui/cocoa/hung_renderer_controller.mm',
+        'browser/ui/cocoa/hyperlink_text_view.h',
+        'browser/ui/cocoa/hyperlink_text_view.mm',
+        'browser/ui/cocoa/image_button_cell.h',
+        'browser/ui/cocoa/image_button_cell.mm',
+        'browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm',
+        'browser/ui/cocoa/info_bubble_view.h',
+        'browser/ui/cocoa/info_bubble_view.mm',
+        'browser/ui/cocoa/info_bubble_window.h',
+        'browser/ui/cocoa/info_bubble_window.mm',
+        'browser/ui/cocoa/infobars/after_translate_infobar_controller.h',
+        'browser/ui/cocoa/infobars/after_translate_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/alternate_nav_infobar_controller.h',
+        'browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/before_translate_infobar_controller.h',
+        'browser/ui/cocoa/infobars/before_translate_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/confirm_infobar_controller.h',
+        'browser/ui/cocoa/infobars/confirm_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/extension_infobar_controller.h',
+        'browser/ui/cocoa/infobars/extension_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/infobar_container_controller.h',
+        'browser/ui/cocoa/infobars/infobar_container_controller.mm',
+        'browser/ui/cocoa/infobars/infobar_controller.h',
+        'browser/ui/cocoa/infobars/infobar_controller.mm',
+        'browser/ui/cocoa/infobars/infobar_gradient_view.h',
+        'browser/ui/cocoa/infobars/infobar_gradient_view.mm',
+        'browser/ui/cocoa/infobars/infobar_utilities.h',
+        'browser/ui/cocoa/infobars/infobar_utilities.mm',
+        'browser/ui/cocoa/infobars/infobar.h',
+        'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc',
+        'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h',
+        'browser/ui/cocoa/infobars/translate_infobar_base.h',
+        'browser/ui/cocoa/infobars/translate_infobar_base.mm',
+        'browser/ui/cocoa/infobars/translate_message_infobar_controller.h',
+        'browser/ui/cocoa/infobars/translate_message_infobar_controller.mm',
+        'browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h',
+        'browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm',
+        'browser/ui/cocoa/key_equivalent_constants.h',
+        'browser/ui/cocoa/key_equivalent_constants.mm',
+        'browser/ui/cocoa/keystone_infobar_delegate.h',
+        'browser/ui/cocoa/keystone_infobar_delegate.mm',
+        'browser/ui/cocoa/l10n_util.h',
+        'browser/ui/cocoa/l10n_util.mm',
+        'browser/ui/cocoa/last_active_browser_cocoa.cc',
+        'browser/ui/cocoa/last_active_browser_cocoa.h',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field.h',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field.mm',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm',
+        'browser/ui/cocoa/location_bar/bubble_decoration.h',
+        'browser/ui/cocoa/location_bar/bubble_decoration.mm',
+        'browser/ui/cocoa/location_bar/button_decoration.h',
+        'browser/ui/cocoa/location_bar/button_decoration.mm',
+        'browser/ui/cocoa/location_bar/content_setting_decoration.h',
+        'browser/ui/cocoa/location_bar/content_setting_decoration.mm',
+        'browser/ui/cocoa/location_bar/ev_bubble_decoration.h',
+        'browser/ui/cocoa/location_bar/ev_bubble_decoration.mm',
+        'browser/ui/cocoa/location_bar/image_decoration.h',
+        'browser/ui/cocoa/location_bar/image_decoration.mm',
+        'browser/ui/cocoa/location_bar/keyword_hint_decoration.h',
+        'browser/ui/cocoa/location_bar/keyword_hint_decoration.mm',
+        'browser/ui/cocoa/location_bar/location_bar_decoration.h',
+        'browser/ui/cocoa/location_bar/location_bar_decoration.mm',
+        'browser/ui/cocoa/location_bar/location_bar_view_mac.h',
+        'browser/ui/cocoa/location_bar/location_bar_view_mac.mm',
+        'browser/ui/cocoa/location_bar/location_icon_decoration.h',
+        'browser/ui/cocoa/location_bar/location_icon_decoration.mm',
+        'browser/ui/cocoa/location_bar/mic_search_decoration.h',
+        'browser/ui/cocoa/location_bar/mic_search_decoration.mm',
+        'browser/ui/cocoa/location_bar/page_action_decoration.h',
+        'browser/ui/cocoa/location_bar/page_action_decoration.mm',
+        'browser/ui/cocoa/location_bar/selected_keyword_decoration.h',
+        'browser/ui/cocoa/location_bar/selected_keyword_decoration.mm',
+        'browser/ui/cocoa/location_bar/star_decoration.h',
+        'browser/ui/cocoa/location_bar/star_decoration.mm',
+        'browser/ui/cocoa/location_bar/zoom_decoration.h',
+        'browser/ui/cocoa/location_bar/zoom_decoration.mm',
+        'browser/ui/cocoa/login_prompt_cocoa.h',
+        'browser/ui/cocoa/login_prompt_cocoa.mm',
+        'browser/ui/cocoa/main_menu_item.h',
+        'browser/ui/cocoa/menu_button.h',
+        'browser/ui/cocoa/menu_button.mm',
+        'browser/ui/cocoa/multi_key_equivalent_button.h',
+        'browser/ui/cocoa/multi_key_equivalent_button.mm',
+        'browser/ui/cocoa/new_tab_button.h',
+        'browser/ui/cocoa/new_tab_button.mm',
+        'browser/ui/cocoa/nine_part_button_cell.h',
+        'browser/ui/cocoa/nine_part_button_cell.mm',
+        'browser/ui/cocoa/notifications/balloon_collection_cocoa.mm',
+        'browser/ui/cocoa/notifications/balloon_controller.h',
+        'browser/ui/cocoa/notifications/balloon_controller.mm',
+        'browser/ui/cocoa/notifications/balloon_view.h',
+        'browser/ui/cocoa/notifications/balloon_view.mm',
+        'browser/ui/cocoa/notifications/balloon_view_bridge.h',
+        'browser/ui/cocoa/notifications/balloon_view_bridge.mm',
+        'browser/ui/cocoa/notifications/balloon_view_host_mac.h',
+        'browser/ui/cocoa/notifications/balloon_view_host_mac.mm',
+        'browser/ui/cocoa/notifications/message_center_tray_bridge.h',
+        'browser/ui/cocoa/notifications/message_center_tray_bridge.mm',
+        'browser/ui/cocoa/nsmenuitem_additions.h',
+        'browser/ui/cocoa/nsmenuitem_additions.mm',
+        'browser/ui/cocoa/nsview_additions.h',
+        'browser/ui/cocoa/nsview_additions.mm',
+        'browser/ui/cocoa/omnibox/omnibox_popup_cell.h',
+        'browser/ui/cocoa/omnibox/omnibox_popup_cell.mm',
+        'browser/ui/cocoa/omnibox/omnibox_popup_matrix.h',
+        'browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm',
+        'browser/ui/cocoa/omnibox/omnibox_popup_separator_view.h',
+        'browser/ui/cocoa/omnibox/omnibox_popup_separator_view.mm',
+        'browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h',
+        'browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm',
+        'browser/ui/cocoa/omnibox/omnibox_view_mac.h',
+        'browser/ui/cocoa/omnibox/omnibox_view_mac.mm',
+        'browser/ui/cocoa/one_click_signin_bubble_controller.h',
+        'browser/ui/cocoa/one_click_signin_bubble_controller.mm',
+        'browser/ui/cocoa/one_click_signin_dialog_controller.h',
+        'browser/ui/cocoa/one_click_signin_dialog_controller.mm',
+        'browser/ui/cocoa/one_click_signin_view_controller.h',
+        'browser/ui/cocoa/one_click_signin_view_controller.mm',
+        'browser/ui/cocoa/panels/display_settings_provider_cocoa.mm',
+        'browser/ui/cocoa/panels/mouse_drag_controller.h',
+        'browser/ui/cocoa/panels/mouse_drag_controller.mm',
+        'browser/ui/cocoa/panels/panel_cocoa.h',
+        'browser/ui/cocoa/panels/panel_cocoa.mm',
+        'browser/ui/cocoa/panels/panel_stack_window_cocoa.h',
+        'browser/ui/cocoa/panels/panel_stack_window_cocoa.mm',
+        'browser/ui/cocoa/panels/panel_titlebar_view_cocoa.h',
+        'browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm',
+        'browser/ui/cocoa/panels/panel_utils_cocoa.h',
+        'browser/ui/cocoa/panels/panel_utils_cocoa.mm',
+        'browser/ui/cocoa/panels/panel_window_controller_cocoa.h',
+        'browser/ui/cocoa/panels/panel_window_controller_cocoa.mm',
+        'browser/ui/cocoa/presentation_mode_controller.h',
+        'browser/ui/cocoa/presentation_mode_controller.mm',
+        'browser/ui/cocoa/profile_menu_controller.h',
+        'browser/ui/cocoa/profile_menu_controller.mm',
+        'browser/ui/cocoa/rect_path_utils.h',
+        'browser/ui/cocoa/rect_path_utils.mm',
+        'browser/ui/cocoa/restart_browser.h',
+        'browser/ui/cocoa/restart_browser.mm',
+        'browser/ui/cocoa/screen_capture_notification_ui_cocoa.h',
+        'browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm',
+        'browser/ui/cocoa/simple_message_box_mac.mm',
+        'browser/ui/cocoa/speech_recognition_bubble_cocoa.mm',
+        'browser/ui/cocoa/speech_recognition_window_controller.h',
+        'browser/ui/cocoa/speech_recognition_window_controller.mm',
+        'browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h',
+        'browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm',
+        'browser/ui/cocoa/status_bubble_mac.h',
+        'browser/ui/cocoa/status_bubble_mac.mm',
+        'browser/ui/cocoa/status_icons/status_icon_mac.h',
+        'browser/ui/cocoa/status_icons/status_icon_mac.mm',
+        'browser/ui/cocoa/status_icons/status_tray_mac.h',
+        'browser/ui/cocoa/status_icons/status_tray_mac.mm',
+        'browser/ui/cocoa/styled_text_field.h',
+        'browser/ui/cocoa/styled_text_field.mm',
+        'browser/ui/cocoa/styled_text_field_cell.h',
+        'browser/ui/cocoa/styled_text_field_cell.mm',
+        'browser/ui/cocoa/profile_signin_confirmation_dialog_cocoa.h',
+        'browser/ui/cocoa/profile_signin_confirmation_dialog_cocoa.mm',
+        'browser/ui/cocoa/profile_signin_confirmation_view_controller.h',
+        'browser/ui/cocoa/profile_signin_confirmation_view_controller.mm',
+        'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h',
+        'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm',
+        'browser/ui/cocoa/tab_contents/favicon_util_mac.h',
+        'browser/ui/cocoa/tab_contents/favicon_util_mac.mm',
+        'browser/ui/cocoa/tab_contents/overlayable_contents_controller.h',
+        'browser/ui/cocoa/tab_contents/overlayable_contents_controller.mm',
+        'browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h',
+        'browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_controller.h',
+        'browser/ui/cocoa/tab_contents/sad_tab_controller.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_view.h',
+        'browser/ui/cocoa/tab_contents/sad_tab_view.mm',
+        'browser/ui/cocoa/tab_contents/tab_contents_controller.h',
+        'browser/ui/cocoa/tab_contents/tab_contents_controller.mm',
+        'browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h',
+        'browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm',
+        'browser/ui/cocoa/tab_modal_confirm_dialog_mac.h',
+        'browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm',
+        'browser/ui/cocoa/table_row_nsimage_cache.h',
+        'browser/ui/cocoa/table_row_nsimage_cache.mm',
+        'browser/ui/cocoa/tabpose_window.h',
+        'browser/ui/cocoa/tabpose_window.mm',
+        'browser/ui/cocoa/tabs/dock_info_mac.cc',
+        'browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.h',
+        'browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.mm',
+        'browser/ui/cocoa/tabs/tab_controller.h',
+        'browser/ui/cocoa/tabs/tab_controller.mm',
+        'browser/ui/cocoa/tabs/tab_projecting_image_view.h',
+        'browser/ui/cocoa/tabs/tab_projecting_image_view.mm',
+        'browser/ui/cocoa/tabs/tab_strip_controller.h',
+        'browser/ui/cocoa/tabs/tab_strip_controller.mm',
+        'browser/ui/cocoa/tabs/tab_strip_drag_controller.h',
+        'browser/ui/cocoa/tabs/tab_strip_drag_controller.mm',
+        'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h',
+        'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.mm',
+        'browser/ui/cocoa/tabs/tab_strip_view.h',
+        'browser/ui/cocoa/tabs/tab_strip_view.mm',
+        'browser/ui/cocoa/tabs/tab_view.h',
+        'browser/ui/cocoa/tabs/tab_view.mm',
+        'browser/ui/cocoa/tabs/tab_window_controller.h',
+        'browser/ui/cocoa/tabs/tab_window_controller.mm',
+        'browser/ui/cocoa/tabs/throbber_view.h',
+        'browser/ui/cocoa/tabs/throbber_view.mm',
+        'browser/ui/cocoa/tabs/throbbing_image_view.h',
+        'browser/ui/cocoa/tabs/throbbing_image_view.mm',
+        'browser/ui/cocoa/task_manager_mac.h',
+        'browser/ui/cocoa/task_manager_mac.mm',
+        'browser/ui/cocoa/themed_window.h',
+        'browser/ui/cocoa/themed_window.mm',
+        'browser/ui/cocoa/toolbar/back_forward_menu_controller.h',
+        'browser/ui/cocoa/toolbar/back_forward_menu_controller.mm',
+        'browser/ui/cocoa/toolbar/reload_button.h',
+        'browser/ui/cocoa/toolbar/reload_button.mm',
+        'browser/ui/cocoa/toolbar/toolbar_button.h',
+        'browser/ui/cocoa/toolbar/toolbar_button.mm',
+        'browser/ui/cocoa/toolbar/toolbar_controller.h',
+        'browser/ui/cocoa/toolbar/toolbar_controller.mm',
+        'browser/ui/cocoa/toolbar/toolbar_view.h',
+        'browser/ui/cocoa/toolbar/toolbar_view.mm',
+        'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h',
+        'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm',
+        'browser/ui/cocoa/ui_localizer.h',
+        'browser/ui/cocoa/ui_localizer.mm',
+        'browser/ui/cocoa/url_drop_target.h',
+        'browser/ui/cocoa/url_drop_target.mm',
+        'browser/ui/cocoa/validation_message_bubble_cocoa.mm',
+        'browser/ui/cocoa/validation_message_bubble_controller.h',
+        'browser/ui/cocoa/vertical_gradient_view.h',
+        'browser/ui/cocoa/vertical_gradient_view.mm',
+        'browser/ui/cocoa/view_id_util.h',
+        'browser/ui/cocoa/view_id_util.mm',
+        'browser/ui/cocoa/view_resizer.h',
+        'browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm',
+        'browser/ui/cocoa/web_dialog_window_controller.h',
+        'browser/ui/cocoa/web_dialog_window_controller.mm',
+        'browser/ui/cocoa/website_settings_bubble_controller.h',
+        'browser/ui/cocoa/website_settings_bubble_controller.mm',
+        'browser/ui/cocoa/window_restore_utils.h',
+        'browser/ui/cocoa/window_restore_utils.mm',
+        'browser/ui/cocoa/window_size_autosaver.h',
+        'browser/ui/cocoa/window_size_autosaver.mm',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_button.h',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_button.mm',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm',
+        'browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h',
+        'browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.mm',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_controller.h',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm',
+        'browser/ui/collected_cookies_infobar_delegate.cc',
+        'browser/ui/collected_cookies_infobar_delegate.h',
+        'browser/ui/confirm_bubble.h',
+        'browser/ui/confirm_bubble_model.cc',
+        'browser/ui/confirm_bubble_model.h',
+        'browser/ui/content_settings/content_setting_bubble_model.cc',
+        'browser/ui/content_settings/content_setting_bubble_model.h',
+        'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
+        'browser/ui/content_settings/content_setting_image_model.cc',
+        'browser/ui/content_settings/content_setting_image_model.h',
+        'browser/ui/content_settings/content_setting_media_menu_model.cc',
+        'browser/ui/content_settings/content_setting_media_menu_model.h',
+        'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc',
+        'browser/ui/content_settings/media_setting_changed_infobar_delegate.h',
+        'browser/ui/crypto_module_password_dialog.cc',
+        'browser/ui/crypto_module_password_dialog.h',
+        'browser/ui/crypto_module_password_dialog_nss.cc',
+        'browser/ui/crypto_module_password_dialog_openssl.cc',
+        'browser/ui/extensions/application_launch.cc',
+        'browser/ui/extensions/application_launch.h',
+        'browser/ui/extensions/extension_install_ui_default.cc',
+        'browser/ui/extensions/extension_install_ui_default.h',
+        'browser/ui/extensions/extension_enable_flow.cc',
+        'browser/ui/extensions/extension_enable_flow.h',
+        'browser/ui/extensions/extension_enable_flow_delegate.h',
+        'browser/ui/external_protocol_dialog_delegate.cc',
+        'browser/ui/external_protocol_dialog_delegate.h',
+        'browser/ui/fast_unload_controller.cc',
+        'browser/ui/fast_unload_controller.h',
+        'browser/ui/find_bar/find_bar.h',
+        'browser/ui/find_bar/find_bar_controller.cc',
+        'browser/ui/find_bar/find_bar_controller.h',
+        'browser/ui/find_bar/find_bar_state.h',
+        'browser/ui/find_bar/find_bar_state_factory.cc',
+        'browser/ui/find_bar/find_bar_state_factory.h',
+        'browser/ui/find_bar/find_notification_details.h',
+        'browser/ui/find_bar/find_tab_helper.cc',
+        'browser/ui/find_bar/find_tab_helper.h',
+        'browser/ui/fullscreen/fullscreen_controller.cc',
+        'browser/ui/fullscreen/fullscreen_controller.h',
+        'browser/ui/fullscreen/fullscreen_exit_bubble.cc',
+        'browser/ui/fullscreen/fullscreen_exit_bubble.h',
+        'browser/ui/fullscreen/fullscreen_exit_bubble_type.cc',
+        'browser/ui/fullscreen/fullscreen_exit_bubble_type.h',
+        'browser/ui/gesture_prefs_observer_factory_aura.cc',
+        'browser/ui/gesture_prefs_observer_factory_aura.h',
+        'browser/ui/global_error/global_error.cc',
+        'browser/ui/global_error/global_error.h',
+        'browser/ui/global_error/global_error_bubble_view_base.h',
+        'browser/ui/global_error/global_error_service.cc',
+        'browser/ui/global_error/global_error_service.h',
+        'browser/ui/global_error/global_error_service_factory.cc',
+        'browser/ui/global_error/global_error_service_factory.h',
+        'browser/ui/gtk/accelerator_utils_gtk.cc',
+        'browser/ui/gtk/accelerators_gtk.cc',
+        'browser/ui/gtk/accelerators_gtk.h',
+        'browser/ui/gtk/apps/chrome_shell_window_delegate_gtk.cc',
+        'browser/ui/gtk/apps/native_app_window_gtk.cc',
+        'browser/ui/gtk/apps/native_app_window_gtk.h',
+        'browser/ui/gtk/autofill/autofill_popup_view_gtk.cc',
+        'browser/ui/gtk/autofill/autofill_popup_view_gtk.h',
+        'browser/ui/gtk/avatar_menu_bubble_gtk.cc',
+        'browser/ui/gtk/avatar_menu_bubble_gtk.h',
+        'browser/ui/gtk/avatar_menu_button_gtk.cc',
+        'browser/ui/gtk/avatar_menu_button_gtk.h',
+        'browser/ui/gtk/avatar_menu_item_gtk.cc',
+        'browser/ui/gtk/avatar_menu_item_gtk.h',
+        'browser/ui/gtk/back_forward_button_gtk.cc',
+        'browser/ui/gtk/back_forward_button_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bar_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_drag_drop_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_editor_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_tree_model.cc',
+        'browser/ui/gtk/bookmarks/bookmark_tree_model.h',
+        'browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_utils_gtk.h',
+        'browser/ui/gtk/browser_actions_toolbar_gtk.cc',
+        'browser/ui/gtk/browser_actions_toolbar_gtk.h',
+        'browser/ui/gtk/browser_titlebar.cc',
+        'browser/ui/gtk/browser_titlebar.h',
+        'browser/ui/gtk/browser_toolbar_gtk.cc',
+        'browser/ui/gtk/browser_toolbar_gtk.h',
+        'browser/ui/gtk/browser_window_gtk.cc',
+        'browser/ui/gtk/browser_window_gtk.h',
+        'browser/ui/gtk/bubble/bubble_accelerators_gtk.cc',
+        'browser/ui/gtk/bubble/bubble_accelerators_gtk.h',
+        'browser/ui/gtk/bubble/bubble_gtk.cc',
+        'browser/ui/gtk/bubble/bubble_gtk.h',
+        'browser/ui/gtk/certificate_viewer_gtk.cc',
+        'browser/ui/gtk/chrome_browser_main_extra_parts_gtk.cc',
+        'browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h',
+        'browser/ui/gtk/chrome_gtk_frame.cc',
+        'browser/ui/gtk/chrome_gtk_frame.h',
+        'browser/ui/gtk/collected_cookies_gtk.cc',
+        'browser/ui/gtk/collected_cookies_gtk.h',
+        'browser/ui/gtk/confirm_bubble_gtk.cc',
+        'browser/ui/gtk/confirm_bubble_gtk.h',
+        'browser/ui/gtk/color_chooser_gtk.cc',
+        'browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc',
+        'browser/ui/gtk/constrained_window_gtk.cc',
+        'browser/ui/gtk/constrained_window_gtk.h',
+        'browser/ui/gtk/content_setting_bubble_gtk.cc',
+        'browser/ui/gtk/content_setting_bubble_gtk.h',
+        'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc',
+        'browser/ui/gtk/create_application_shortcuts_dialog_gtk.h',
+        'browser/ui/gtk/crypto_module_password_dialog_gtk.cc',
+        'browser/ui/gtk/custom_button.cc',
+        'browser/ui/gtk/custom_button.h',
+        'browser/ui/gtk/custom_drag.cc',
+        'browser/ui/gtk/custom_drag.h',
+        'browser/ui/gtk/download/download_in_progress_dialog_gtk.cc',
+        'browser/ui/gtk/download/download_in_progress_dialog_gtk.h',
+        'browser/ui/gtk/download/download_item_gtk.cc',
+        'browser/ui/gtk/download/download_item_gtk.h',
+        'browser/ui/gtk/download/download_shelf_context_menu_gtk.cc',
+        'browser/ui/gtk/download/download_shelf_context_menu_gtk.h',
+        'browser/ui/gtk/download/download_shelf_gtk.cc',
+        'browser/ui/gtk/download/download_shelf_gtk.h',
+        'browser/ui/gtk/download/download_started_animation_gtk.cc',
+        'browser/ui/gtk/edit_search_engine_dialog.cc',
+        'browser/ui/gtk/edit_search_engine_dialog.h',
+        'browser/ui/gtk/event_utils.cc',
+        'browser/ui/gtk/event_utils.h',
+        'browser/ui/gtk/extensions/browser_action_test_util_gtk.cc',
+        'browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc',
+        'browser/ui/gtk/extensions/bundle_installed_bubble_gtk.h',
+        'browser/ui/gtk/extensions/extension_install_dialog_gtk.cc',
+        'browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc',
+        'browser/ui/gtk/extensions/extension_installed_bubble_gtk.h',
+        'browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc',
+        'browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h',
+        'browser/ui/gtk/extensions/extension_popup_gtk.cc',
+        'browser/ui/gtk/extensions/extension_popup_gtk.h',
+        'browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc',
+        'browser/ui/gtk/extensions/extension_view_gtk.cc',
+        'browser/ui/gtk/extensions/extension_view_gtk.h',
+        'browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc',
+        'browser/ui/gtk/extensions/media_galleries_dialog_gtk.h',
+        'browser/ui/gtk/find_bar_gtk.cc',
+        'browser/ui/gtk/find_bar_gtk.h',
+        'browser/ui/gtk/first_run_bubble.cc',
+        'browser/ui/gtk/first_run_bubble.h',
+        'browser/ui/gtk/first_run_dialog.cc',
+        'browser/ui/gtk/first_run_dialog.h',
+        'browser/ui/gtk/fullscreen_exit_bubble_gtk.cc',
+        'browser/ui/gtk/fullscreen_exit_bubble_gtk.h',
+        'browser/ui/gtk/gconf_titlebar_listener.cc',
+        'browser/ui/gtk/gconf_titlebar_listener.h',
+        'browser/ui/gtk/global_error_bubble.cc',
+        'browser/ui/gtk/global_error_bubble.h',
+        'browser/ui/gtk/global_history_menu.cc',
+        'browser/ui/gtk/global_history_menu.h',
+        'browser/ui/gtk/global_menu_bar.cc',
+        'browser/ui/gtk/global_menu_bar.h',
+        'browser/ui/gtk/gtk_chrome_button.cc',
+        'browser/ui/gtk/gtk_chrome_button.h',
+        'browser/ui/gtk/gtk_chrome_cookie_view.cc',
+        'browser/ui/gtk/gtk_chrome_cookie_view.h',
+        'browser/ui/gtk/gtk_chrome_link_button.cc',
+        'browser/ui/gtk/gtk_chrome_link_button.h',
+        'browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc',
+        'browser/ui/gtk/gtk_chrome_shrinkable_hbox.h',
+        'browser/ui/gtk/gtk_custom_menu.cc',
+        'browser/ui/gtk/gtk_custom_menu.h',
+        'browser/ui/gtk/gtk_custom_menu_item.cc',
+        'browser/ui/gtk/gtk_custom_menu_item.h',
+        'browser/ui/gtk/gtk_input_event_box.cc',
+        'browser/ui/gtk/gtk_input_event_box.h',
+        'browser/ui/gtk/gtk_theme_service.cc',
+        'browser/ui/gtk/gtk_theme_service.h',
+        'browser/ui/gtk/gtk_tree.cc',
+        'browser/ui/gtk/gtk_tree.h',
+        'browser/ui/gtk/gtk_util.cc',
+        'browser/ui/gtk/gtk_util.h',
+        'browser/ui/gtk/gtk_window_util.cc',
+        'browser/ui/gtk/gtk_window_util.h',
+        'browser/ui/gtk/hover_controller_gtk.cc',
+        'browser/ui/gtk/hover_controller_gtk.h',
+        'browser/ui/gtk/hung_renderer_dialog_gtk.cc',
+        'browser/ui/gtk/importer/import_lock_dialog_gtk.cc',
+        'browser/ui/gtk/importer/import_lock_dialog_gtk.h',
+        'browser/ui/gtk/infobars/after_translate_infobar_gtk.cc',
+        'browser/ui/gtk/infobars/after_translate_infobar_gtk.h',
+        'browser/ui/gtk/infobars/alternate_nav_infobar_gtk.cc',
+        'browser/ui/gtk/infobars/alternate_nav_infobar_gtk.h',
+        'browser/ui/gtk/infobars/before_translate_infobar_gtk.cc',
+        'browser/ui/gtk/infobars/before_translate_infobar_gtk.h',
+        'browser/ui/gtk/infobars/confirm_infobar_gtk.cc',
+        'browser/ui/gtk/infobars/confirm_infobar_gtk.h',
+        'browser/ui/gtk/infobars/extension_infobar_gtk.cc',
+        'browser/ui/gtk/infobars/extension_infobar_gtk.h',
+        'browser/ui/gtk/infobars/infobar_container_gtk.cc',
+        'browser/ui/gtk/infobars/infobar_container_gtk.h',
+        'browser/ui/gtk/infobars/infobar_gtk.cc',
+        'browser/ui/gtk/infobars/infobar_gtk.h',
+        'browser/ui/gtk/infobars/translate_infobar_base_gtk.cc',
+        'browser/ui/gtk/infobars/translate_infobar_base_gtk.h',
+        'browser/ui/gtk/infobars/translate_message_infobar_gtk.cc',
+        'browser/ui/gtk/infobars/translate_message_infobar_gtk.h',
+        'browser/ui/gtk/javascript_app_modal_dialog_gtk.cc',
+        'browser/ui/gtk/javascript_app_modal_dialog_gtk.h',
+        'browser/ui/gtk/location_bar_view_gtk.cc',
+        'browser/ui/gtk/location_bar_view_gtk.h',
+        'browser/ui/gtk/login_prompt_gtk.cc',
+        'browser/ui/gtk/menu_bar_helper.cc',
+        'browser/ui/gtk/menu_bar_helper.h',
+        'browser/ui/gtk/menu_gtk.cc',
+        'browser/ui/gtk/menu_gtk.h',
+        'browser/ui/gtk/nine_box.cc',
+        'browser/ui/gtk/nine_box.h',
+        'browser/ui/gtk/notifications/balloon_collection_gtk.cc',
+        'browser/ui/gtk/notifications/balloon_view_gtk.cc',
+        'browser/ui/gtk/notifications/balloon_view_gtk.h',
+        'browser/ui/gtk/notifications/balloon_view_host_gtk.cc',
+        'browser/ui/gtk/notifications/balloon_view_host_gtk.h',
+        'browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc',
+        'browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h',
+        'browser/ui/gtk/omnibox/omnibox_view_gtk.cc',
+        'browser/ui/gtk/omnibox/omnibox_view_gtk.h',
+        'browser/ui/gtk/one_click_signin_bubble_gtk.cc',
+        'browser/ui/gtk/one_click_signin_bubble_gtk.h',
+        'browser/ui/gtk/overflow_button.cc',
+        'browser/ui/gtk/overflow_button.h',
+        'browser/ui/gtk/panels/display_settings_provider_gtk.cc',
+        'browser/ui/gtk/panels/panel_drag_gtk.cc',
+        'browser/ui/gtk/panels/panel_drag_gtk.h',
+        'browser/ui/gtk/panels/panel_gtk.cc',
+        'browser/ui/gtk/panels/panel_gtk.h',
+        'browser/ui/gtk/panels/panel_stack_window_gtk.cc',
+        'browser/ui/gtk/panels/panel_stack_window_gtk.h',
+        'browser/ui/gtk/panels/panel_titlebar_gtk.cc',
+        'browser/ui/gtk/panels/panel_titlebar_gtk.h',
+        'browser/ui/gtk/password_generation_bubble_gtk.cc',
+        'browser/ui/gtk/password_generation_bubble_gtk.h',
+        'browser/ui/gtk/process_singleton_dialog.cc',
+        'browser/ui/gtk/process_singleton_dialog.h',
+        'browser/ui/gtk/protocol_dialog_gtk.cc',
+        'browser/ui/gtk/protocol_dialog_gtk.h',
+        'browser/ui/gtk/reload_button_gtk.cc',
+        'browser/ui/gtk/reload_button_gtk.h',
+        'browser/ui/gtk/rounded_window.cc',
+        'browser/ui/gtk/rounded_window.h',
+        'browser/ui/gtk/sad_tab_gtk.cc',
+        'browser/ui/gtk/sad_tab_gtk.h',
+        'browser/ui/gtk/screen_capture_notification_ui_gtk.cc',
+        'browser/ui/gtk/script_bubble_gtk.cc',
+        'browser/ui/gtk/script_bubble_gtk.h',
+        'browser/ui/gtk/simple_message_box_gtk.cc',
+        'browser/ui/gtk/slide_animator_gtk.cc',
+        'browser/ui/gtk/slide_animator_gtk.h',
+        'browser/ui/gtk/speech_recognition_bubble_gtk.cc',
+        'browser/ui/gtk/ssl_client_certificate_selector.cc',
+        'browser/ui/gtk/status_bubble_gtk.cc',
+        'browser/ui/gtk/status_bubble_gtk.h',
+        'browser/ui/gtk/status_icons/status_icon_gtk.cc',
+        'browser/ui/gtk/status_icons/status_icon_gtk.h',
+        'browser/ui/gtk/status_icons/status_tray_gtk.cc',
+        'browser/ui/gtk/status_icons/status_tray_gtk.h',
+        'browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc',
+        'browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.h',
+        'browser/ui/gtk/tab_contents/render_view_context_menu_gtk.cc',
+        'browser/ui/gtk/tab_contents/render_view_context_menu_gtk.h',
+        'browser/ui/gtk/tab_contents/web_drag_bookmark_handler_gtk.cc',
+        'browser/ui/gtk/tab_contents/web_drag_bookmark_handler_gtk.h',
+        'browser/ui/gtk/tab_contents_container_gtk.cc',
+        'browser/ui/gtk/tab_contents_container_gtk.h',
+        'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc',
+        'browser/ui/gtk/tab_modal_confirm_dialog_gtk.h',
+        'browser/ui/gtk/tabs/dock_info_gtk.cc',
+        'browser/ui/gtk/tabs/drag_data.cc',
+        'browser/ui/gtk/tabs/drag_data.h',
+        'browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc',
+        'browser/ui/gtk/tabs/dragged_tab_controller_gtk.h',
+        'browser/ui/gtk/tabs/dragged_view_gtk.cc',
+        'browser/ui/gtk/tabs/dragged_view_gtk.h',
+        'browser/ui/gtk/tabs/tab_gtk.cc',
+        'browser/ui/gtk/tabs/tab_gtk.h',
+        'browser/ui/gtk/tabs/tab_renderer_gtk.cc',
+        'browser/ui/gtk/tabs/tab_renderer_gtk.h',
+        'browser/ui/gtk/tabs/tab_strip_gtk.cc',
+        'browser/ui/gtk/tabs/tab_strip_gtk.h',
+        'browser/ui/gtk/tabs/tab_strip_menu_controller.cc',
+        'browser/ui/gtk/tabs/tab_strip_menu_controller.h',
+        'browser/ui/gtk/task_manager_gtk.cc',
+        'browser/ui/gtk/task_manager_gtk.h',
+        'browser/ui/gtk/throbber_gtk.cc',
+        'browser/ui/gtk/throbber_gtk.h',
+        'browser/ui/gtk/titlebar_throb_animation.cc',
+        'browser/ui/gtk/titlebar_throb_animation.h',
+        'browser/ui/gtk/unity_service.cc',
+        'browser/ui/gtk/unity_service.h',
+        'browser/ui/gtk/update_recommended_dialog.cc',
+        'browser/ui/gtk/update_recommended_dialog.h',
+        'browser/ui/gtk/validation_message_bubble_gtk.cc',
+        'browser/ui/gtk/view_id_util.cc',
+        'browser/ui/gtk/view_id_util.h',
+        'browser/ui/gtk/web_contents_modal_dialog_manager_gtk.cc',
+        'browser/ui/gtk/web_dialog_gtk.cc',
+        'browser/ui/gtk/web_dialog_gtk.h',
+        'browser/ui/gtk/website_settings/permission_selector.cc',
+        'browser/ui/gtk/website_settings/permission_selector.h',
+        'browser/ui/gtk/website_settings/permission_selector_observer.h',
+        'browser/ui/gtk/website_settings/website_settings_popup_gtk.cc',
+        'browser/ui/gtk/website_settings/website_settings_popup_gtk.h',
+        'browser/ui/gtk/zoom_bubble_gtk.cc',
+        'browser/ui/gtk/zoom_bubble_gtk.h',
+        'browser/ui/host_desktop.cc',
+        'browser/ui/host_desktop.h',
+        'browser/ui/hung_plugin_tab_helper.cc',
+        'browser/ui/hung_plugin_tab_helper.h',
+        'browser/ui/immersive_fullscreen_configuration.cc',
+        'browser/ui/immersive_fullscreen_configuration.h',
+        'browser/ui/login/login_model.h',
+        'browser/ui/login/login_prompt.cc',
+        'browser/ui/login/login_prompt.h',
+        'browser/ui/metro_pin_tab_helper_win.cc',
+        'browser/ui/metro_pin_tab_helper_win.h',
+        'browser/ui/native_focus_tracker.h',
+        'browser/ui/network_profile_bubble.cc',
+        'browser/ui/network_profile_bubble.h',
+        'browser/ui/ntp_background_util.cc',
+        'browser/ui/ntp_background_util.h',
+        'browser/ui/omnibox/alternate_nav_infobar_delegate.cc',
+        'browser/ui/omnibox/alternate_nav_infobar_delegate.h',
+        'browser/ui/omnibox/alternate_nav_url_fetcher.cc',
+        'browser/ui/omnibox/alternate_nav_url_fetcher.h',
+        'browser/ui/omnibox/location_bar.h',
+        'browser/ui/omnibox/location_bar_util.cc',
+        'browser/ui/omnibox/location_bar_util.h',
+        'browser/ui/omnibox/omnibox_controller.h',
+        'browser/ui/omnibox/omnibox_controller.cc',
+        'browser/ui/omnibox/omnibox_current_page_delegate.h',
+        'browser/ui/omnibox/omnibox_current_page_delegate_impl.cc',
+        'browser/ui/omnibox/omnibox_current_page_delegate_impl.h',
+        'browser/ui/omnibox/omnibox_edit_controller.h',
+        'browser/ui/omnibox/omnibox_edit_model.cc',
+        'browser/ui/omnibox/omnibox_edit_model.h',
+        'browser/ui/omnibox/omnibox_popup_model.cc',
+        'browser/ui/omnibox/omnibox_popup_model.h',
+        'browser/ui/omnibox/omnibox_popup_model_observer.h',
+        'browser/ui/omnibox/omnibox_popup_view.h',
+        'browser/ui/omnibox/omnibox_view.cc',
+        'browser/ui/omnibox/omnibox_view.h',
+        'browser/ui/options/options_util.cc',
+        'browser/ui/options/options_util.h',
+        'browser/ui/panels/detached_panel_collection.cc',
+        'browser/ui/panels/detached_panel_collection.h',
+        'browser/ui/panels/detached_panel_drag_handler.cc',
+        'browser/ui/panels/detached_panel_drag_handler.h',
+        'browser/ui/panels/display_settings_provider_win.cc',
+        'browser/ui/panels/display_settings_provider_win.h',
+        'browser/ui/panels/display_settings_provider.cc',
+        'browser/ui/panels/display_settings_provider.h',
+        'browser/ui/panels/docked_panel_collection.cc',
+        'browser/ui/panels/docked_panel_collection.h',
+        'browser/ui/panels/docked_panel_drag_handler.cc',
+        'browser/ui/panels/docked_panel_drag_handler.h',
+        'browser/ui/panels/native_panel.h',
+        'browser/ui/panels/native_panel_stack_window.h',
+        'browser/ui/panels/panel.cc',
+        'browser/ui/panels/panel.h',
+        'browser/ui/panels/panel_bounds_animation.cc',
+        'browser/ui/panels/panel_bounds_animation.h',
+        'browser/ui/panels/panel_collection.cc',
+        'browser/ui/panels/panel_collection.h',
+        'browser/ui/panels/panel_constants.h',
+        'browser/ui/panels/panel_drag_controller.cc',
+        'browser/ui/panels/panel_drag_controller.h',
+        'browser/ui/panels/panel_host.cc',
+        'browser/ui/panels/panel_host.h',
+        'browser/ui/panels/panel_resize_controller.cc',
+        'browser/ui/panels/panel_resize_controller.h',
+        'browser/ui/panels/panel_manager.cc',
+        'browser/ui/panels/panel_manager.h',
+        'browser/ui/panels/panel_mouse_watcher.cc',
+        'browser/ui/panels/panel_mouse_watcher.h',
+        'browser/ui/panels/panel_mouse_watcher_observer.h',
+        'browser/ui/panels/panel_mouse_watcher_timer.cc',
+        'browser/ui/panels/stacked_panel_collection.cc',
+        'browser/ui/panels/stacked_panel_collection.h',
+        'browser/ui/panels/stacked_panel_drag_handler.cc',
+        'browser/ui/panels/stacked_panel_drag_handler.h',
+        'browser/ui/pdf/open_pdf_in_reader_prompt_delegate.h',
+        'browser/ui/pdf/pdf_tab_helper.cc',
+        'browser/ui/pdf/pdf_tab_helper.h',
+        'browser/ui/pdf/pdf_unsupported_feature.cc',
+        'browser/ui/pdf/pdf_unsupported_feature.h',
+        'browser/ui/prefs/prefs_tab_helper.cc',
+        'browser/ui/prefs/prefs_tab_helper.h',
+        'browser/ui/profile_error_dialog.cc',
+        'browser/ui/profile_error_dialog.h',
+        'browser/ui/protocol_dialog_delegate.h',
+        'browser/ui/sad_tab.cc',
+        'browser/ui/sad_tab.h',
+        'browser/ui/sad_tab_helper.cc',
+        'browser/ui/sad_tab_helper.h',
+        'browser/ui/sad_tab_types.h',
+        'browser/ui/screen_capture_notification_ui.h',
+        'browser/ui/screen_capture_notification_ui_stub.cc',
+        'browser/ui/search/instant_controller.cc',
+        'browser/ui/search/instant_controller.h',
+        'browser/ui/search/instant_ipc_sender.cc',
+        'browser/ui/search/instant_ipc_sender.h',
+        'browser/ui/search/instant_loader.cc',
+        'browser/ui/search/instant_loader.h',
+        'browser/ui/search/instant_ntp.cc',
+        'browser/ui/search/instant_ntp.h',
+        'browser/ui/search/instant_ntp_prerenderer.cc',
+        'browser/ui/search/instant_ntp_prerenderer.h',
+        'browser/ui/search/instant_page.cc',
+        'browser/ui/search/instant_page.h',
+        'browser/ui/search/instant_tab.cc',
+        'browser/ui/search/instant_tab.h',
+        'browser/ui/search/instant_unload_handler.cc',
+        'browser/ui/search/instant_unload_handler.h',
+        'browser/ui/search/search_delegate.cc',
+        'browser/ui/search/search_delegate.h',
+        'browser/ui/search/search_model.cc',
+        'browser/ui/search/search_model.h',
+        'browser/ui/search/search_model_observer.h',
+        'browser/ui/search/search_tab_helper.cc',
+        'browser/ui/search/search_tab_helper.h',
+        'browser/ui/search/search_ui.cc',
+        'browser/ui/search/search_ui.h',
+        'browser/ui/search_engines/edit_search_engine_controller.cc',
+        'browser/ui/search_engines/edit_search_engine_controller.h',
+        'browser/ui/search_engines/keyword_editor_controller.cc',
+        'browser/ui/search_engines/keyword_editor_controller.h',
+        'browser/ui/search_engines/search_engine_tab_helper.cc',
+        'browser/ui/search_engines/search_engine_tab_helper.h',
+        'browser/ui/search_engines/search_engine_tab_helper_delegate.cc',
+        'browser/ui/search_engines/search_engine_tab_helper_delegate.h',
+        'browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc',
+        'browser/ui/search_engines/template_url_fetcher_ui_callbacks.h',
+        'browser/ui/search_engines/template_url_table_model.cc',
+        'browser/ui/search_engines/template_url_table_model.h',
+        'browser/ui/send_feedback_experiment.cc',
+        'browser/ui/send_feedback_experiment.h',
+        'browser/ui/simple_message_box.h',
+        'browser/ui/singleton_tabs.cc',
+        'browser/ui/singleton_tabs.h',
+        'browser/ui/startup/autolaunch_prompt.cc',
+        'browser/ui/startup/autolaunch_prompt_win.cc',
+        'browser/ui/startup/autolaunch_prompt.h',
+        'browser/ui/startup/bad_flags_prompt.cc',
+        'browser/ui/startup/bad_flags_prompt.h',
+        'browser/ui/startup/default_browser_prompt.cc',
+        'browser/ui/startup/default_browser_prompt.h',
+        'browser/ui/startup/default_browser_prompt_win.cc',
+        'browser/ui/startup/google_api_keys_infobar_delegate.cc',
+        'browser/ui/startup/google_api_keys_infobar_delegate.h',
+        'browser/ui/startup/obsolete_os_infobar_delegate.cc',
+        'browser/ui/startup/obsolete_os_infobar_delegate.h',
+        'browser/ui/startup/session_crashed_infobar_delegate.cc',
+        'browser/ui/startup/session_crashed_infobar_delegate.h',
+        'browser/ui/startup/startup_browser_creator.cc',
+        'browser/ui/startup/startup_browser_creator.h',
+        'browser/ui/startup/startup_browser_creator_impl.cc',
+        'browser/ui/startup/startup_browser_creator_impl.h',
+        'browser/ui/startup/startup_browser_creator_win.cc',
+        'browser/ui/startup/startup_browser_creator_win.h',
+        'browser/ui/startup/startup_tab.cc',
+        'browser/ui/startup/startup_tab.h',
+        'browser/ui/startup/startup_types.h',
+        'browser/ui/status_bubble.h',
+        'browser/ui/sync/browser_synced_window_delegate.h',
+        'browser/ui/sync/browser_synced_window_delegate.cc',
+        'browser/ui/sync/inline_login_dialog.cc',
+        'browser/ui/sync/inline_login_dialog.h',
+        'browser/ui/sync/one_click_signin_bubble_delegate.h',
+        'browser/ui/sync/one_click_signin_bubble_links_delegate.cc',
+        'browser/ui/sync/one_click_signin_bubble_links_delegate.h',
+        'browser/ui/sync/one_click_signin_helper.cc',
+        'browser/ui/sync/one_click_signin_helper.h',
+        'browser/ui/sync/one_click_signin_histogram.h',
+        'browser/ui/sync/one_click_signin_sync_starter.cc',
+        'browser/ui/sync/one_click_signin_sync_starter.h',
+        'browser/ui/sync/profile_signin_confirmation_helper.cc',
+        'browser/ui/sync/profile_signin_confirmation_helper.h',
+        'browser/ui/sync/signin_histogram.h',
+        'browser/ui/sync/sync_promo_ui.cc',
+        'browser/ui/sync/sync_promo_ui.h',
+        'browser/ui/sync/tab_contents_synced_tab_delegate.cc',
+        'browser/ui/sync/tab_contents_synced_tab_delegate.h',
+        'browser/ui/tab_contents/chrome_web_contents_view_delegate.h',
+        'browser/ui/tab_contents/core_tab_helper.cc',
+        'browser/ui/tab_contents/core_tab_helper.h',
+        'browser/ui/tab_contents/core_tab_helper_delegate.cc',
+        'browser/ui/tab_contents/core_tab_helper_delegate.h',
+        'browser/ui/tab_contents/tab_contents_iterator.cc',
+        'browser/ui/tab_contents/tab_contents_iterator.h',
+        'browser/ui/tab_modal_confirm_dialog.h',
+        'browser/ui/tab_modal_confirm_dialog_delegate.cc',
+        'browser/ui/tab_modal_confirm_dialog_delegate.h',
+        'browser/ui/tabs/dock_info.cc',
+        'browser/ui/tabs/dock_info.h',
+        'browser/ui/tabs/hover_tab_selector.cc',
+        'browser/ui/tabs/hover_tab_selector.h',
+        'browser/ui/tabs/pinned_tab_codec.cc',
+        'browser/ui/tabs/pinned_tab_codec.h',
+        'browser/ui/tabs/pinned_tab_service.cc',
+        'browser/ui/tabs/pinned_tab_service.h',
+        'browser/ui/tabs/pinned_tab_service_factory.cc',
+        'browser/ui/tabs/pinned_tab_service_factory.h',
+        'browser/ui/tabs/tab_audio_indicator.cc',
+        'browser/ui/tabs/tab_audio_indicator.h',
+        'browser/ui/tabs/tab_menu_model.cc',
+        'browser/ui/tabs/tab_menu_model.h',
+        'browser/ui/tabs/tab_resources.cc',
+        'browser/ui/tabs/tab_resources.h',
+        'browser/ui/tabs/tab_strip_layout_type.h',
+        'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
+        'browser/ui/tabs/tab_strip_layout_type_prefs.h',
+        'browser/ui/tabs/tab_strip_model.cc',
+        'browser/ui/tabs/tab_strip_model.h',
+        'browser/ui/tabs/tab_strip_model_delegate.h',
+        'browser/ui/tabs/tab_strip_model_observer.cc',
+        'browser/ui/tabs/tab_strip_model_observer.h',
+        'browser/ui/tabs/tab_strip_model_order_controller.cc',
+        'browser/ui/tabs/tab_strip_model_order_controller.h',
+        'browser/ui/tabs/tab_strip_model_utils.cc',
+        'browser/ui/tabs/tab_strip_model_utils.h',
+        'browser/ui/tabs/tab_utils.cc',
+        'browser/ui/tabs/tab_utils.h',
+        'browser/ui/toolbar/back_forward_menu_model.cc',
+        'browser/ui/toolbar/back_forward_menu_model.h',
+        'browser/ui/toolbar/bookmark_sub_menu_model.cc',
+        'browser/ui/toolbar/bookmark_sub_menu_model.h',
+        'browser/ui/toolbar/encoding_menu_controller.cc',
+        'browser/ui/toolbar/encoding_menu_controller.h',
+        'browser/ui/toolbar/recent_tabs_sub_menu_model.cc',
+        'browser/ui/toolbar/recent_tabs_sub_menu_model.h',
+        'browser/ui/toolbar/toolbar_model.h',
+        'browser/ui/toolbar/toolbar_model_impl.cc',
+        'browser/ui/toolbar/toolbar_model_impl.h',
+        'browser/ui/toolbar/toolbar_model_delegate.h',
+        'browser/ui/toolbar/toolbar_model_security_level_list.h',
+        'browser/ui/toolbar/wrench_icon_painter.cc',
+        'browser/ui/toolbar/wrench_icon_painter.h',
+        'browser/ui/toolbar/wrench_menu_model.cc',
+        'browser/ui/toolbar/wrench_menu_model.h',
+        'browser/ui/top_level_widget.h',
+        'browser/ui/uma_browsing_activity_observer.cc',
+        'browser/ui/uma_browsing_activity_observer.h',
+        'browser/ui/uninstall_browser_prompt.h',
+        'browser/ui/unload_controller.cc',
+        'browser/ui/unload_controller.h',
+        'browser/ui/user_data_dir_dialog.h',
+        'browser/ui/validation_message_bubble.h',
+        'browser/ui/view_ids.h',
+        'browser/ui/views/accelerator_utils_aura.cc',
+        'browser/ui/views/accelerator_utils_views.cc',
+        'browser/ui/views/about_ipc_dialog.cc',
+        'browser/ui/views/about_ipc_dialog.h',
+        'browser/ui/views/accessibility/accessibility_event_router_views.cc',
+        'browser/ui/views/accessibility/accessibility_event_router_views.h',
+        'browser/ui/views/accessibility/invert_bubble_view.cc',
+        'browser/ui/views/accessibility/invert_bubble_view.h',
+        'browser/ui/views/app_menu_button_win.cc',
+        'browser/ui/views/app_menu_button_win.h',
+        'browser/ui/views/app_list/app_list_controller_win.cc',
+        'browser/ui/views/apps/chrome_shell_window_delegate_views.cc',
+        'browser/ui/views/apps/native_app_window_views.cc',
+        'browser/ui/views/apps/native_app_window_views.h',
+        'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
+        'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
+        'browser/ui/views/ash/tab_scrubber.h',
+        'browser/ui/views/ash/tab_scrubber.cc',
+        'browser/ui/views/autofill/autocheckout_bubble_views.cc',
+        'browser/ui/views/autofill/autocheckout_bubble_views.h',
+        'browser/ui/views/autofill/autofill_dialog_views.cc',
+        'browser/ui/views/autofill/autofill_dialog_views.h',
+        'browser/ui/views/autofill/autofill_popup_view_views.cc',
+        'browser/ui/views/autofill/autofill_popup_view_views.h',
+        'browser/ui/views/autofill/generated_credit_card_bubble_views.cc',
+        'browser/ui/views/autofill/generated_credit_card_bubble_views.h',
+        'browser/ui/views/autofill/new_credit_card_bubble_views.cc',
+        'browser/ui/views/autofill/new_credit_card_bubble_views.h',
+        'browser/ui/views/autofill/decorated_textfield.cc',
+        'browser/ui/views/autofill/decorated_textfield.h',
+        'browser/ui/views/avatar_menu_bubble_view.cc',
+        'browser/ui/views/avatar_menu_bubble_view.h',
+        'browser/ui/views/avatar_menu_button.cc',
+        'browser/ui/views/avatar_menu_button.h',
+        'browser/ui/views/avatar_label.cc',
+        'browser/ui/views/avatar_label.cc',
+        'browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc',
+        'browser/ui/views/bookmarks/bookmark_bar_instructions_view.h',
+        'browser/ui/views/bookmarks/bookmark_bar_view.cc',
+        'browser/ui/views/bookmarks/bookmark_bar_view.h',
+        'browser/ui/views/bookmarks/bookmark_bubble_view.cc',
+        'browser/ui/views/bookmarks/bookmark_bubble_view.h',
+        'browser/ui/views/bookmarks/bookmark_bubble_view_observer.h',
+        'browser/ui/views/bookmarks/bookmark_context_menu.cc',
+        'browser/ui/views/bookmarks/bookmark_context_menu.h',
+        'browser/ui/views/bookmarks/bookmark_context_menu_controller_win.cc',
+        'browser/ui/views/bookmarks/bookmark_drag_drop_views.cc',
+        'browser/ui/views/bookmarks/bookmark_drag_drop_views.h',
+        'browser/ui/views/bookmarks/bookmark_editor_view.cc',
+        'browser/ui/views/bookmarks/bookmark_editor_view.h',
+        'browser/ui/views/bookmarks/bookmark_menu_controller_views.cc',
+        'browser/ui/views/bookmarks/bookmark_menu_controller_views.h',
+        'browser/ui/views/bookmarks/bookmark_menu_delegate.cc',
+        'browser/ui/views/bookmarks/bookmark_menu_delegate.h',
+        'browser/ui/views/bookmarks/bookmark_prompt_view.cc',
+        'browser/ui/views/bookmarks/bookmark_prompt_view.h',
+        'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc',
+        'browser/ui/views/bookmarks/bookmark_sync_promo_view.h',
+        'browser/ui/views/browser_action_test_util_views.cc',
+        'browser/ui/views/browser_action_view.cc',
+        'browser/ui/views/browser_action_view.h',
+        'browser/ui/views/browser_actions_container.cc',
+        'browser/ui/views/browser_actions_container.h',
+        'browser/ui/views/certificate_viewer_win.cc',
+        'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
+        'browser/ui/views/chrome_browser_main_extra_parts_views.h',
+        'browser/ui/views/chrome_views_delegate.cc',
+        'browser/ui/views/chrome_views_delegate.h',
+        'browser/ui/views/chrome_views_delegate_chromeos.cc',
+        'browser/ui/views/chrome_web_dialog_view.cc',
+        'browser/ui/views/collected_cookies_views.cc',
+        'browser/ui/views/collected_cookies_views.h',
+        'browser/ui/views/color_chooser_aura.cc',
+        'browser/ui/views/color_chooser_dialog.cc',
+        'browser/ui/views/color_chooser_dialog.h',
+        'browser/ui/views/color_chooser_win.cc',
+        'browser/ui/views/confirm_bubble_views.cc',
+        'browser/ui/views/confirm_bubble_views.h',
+        'browser/ui/views/conflicting_module_view_win.cc',
+        'browser/ui/views/conflicting_module_view_win.h',
+        'browser/ui/views/constrained_web_dialog_delegate_views.cc',
+        'browser/ui/views/constrained_window_views.cc',
+        'browser/ui/views/constrained_window_views.h',
+        'browser/ui/views/content_setting_bubble_contents.cc',
+        'browser/ui/views/content_setting_bubble_contents.h',
+        'browser/ui/views/cookie_info_view.cc',
+        'browser/ui/views/cookie_info_view.h',
+        'browser/ui/views/create_application_shortcut_view.cc',
+        'browser/ui/views/create_application_shortcut_view.h',
+        'browser/ui/views/crypto_module_password_dialog_view.cc',
+        'browser/ui/views/crypto_module_password_dialog_view.h',
+        'browser/ui/views/critical_notification_bubble_view.cc',
+        'browser/ui/views/critical_notification_bubble_view.h',
+        'browser/ui/views/desktop_media_picker_views.cc',
+        'browser/ui/views/detachable_toolbar_view.cc',
+        'browser/ui/views/detachable_toolbar_view.h',
+        'browser/ui/views/download/download_in_progress_dialog_view.cc',
+        'browser/ui/views/download/download_in_progress_dialog_view.h',
+        'browser/ui/views/download/download_item_view.cc',
+        'browser/ui/views/download/download_item_view.h',
+        'browser/ui/views/download/download_shelf_context_menu_view.cc',
+        'browser/ui/views/download/download_shelf_context_menu_view.h',
+        'browser/ui/views/download/download_shelf_view.cc',
+        'browser/ui/views/download/download_shelf_view.h',
+        'browser/ui/views/download/download_started_animation_views.cc',
+        'browser/ui/views/dropdown_bar_host.cc',
+        'browser/ui/views/dropdown_bar_host.h',
+        'browser/ui/views/dropdown_bar_host_aura.cc',
+        'browser/ui/views/dropdown_bar_host_delegate.h',
+        'browser/ui/views/dropdown_bar_host_win.cc',
+        'browser/ui/views/dropdown_bar_view.cc',
+        'browser/ui/views/dropdown_bar_view.h',
+        'browser/ui/views/edit_search_engine_dialog.cc',
+        'browser/ui/views/edit_search_engine_dialog.h',
+        'browser/ui/views/extensions/browser_action_drag_data.cc',
+        'browser/ui/views/extensions/browser_action_drag_data.h',
+        'browser/ui/views/extensions/browser_action_overflow_menu_controller.cc',
+        'browser/ui/views/extensions/browser_action_overflow_menu_controller.h',
+        'browser/ui/views/extensions/bundle_installed_bubble.cc',
+        'browser/ui/views/extensions/extension_dialog.cc',
+        'browser/ui/views/extensions/extension_dialog.h',
+        'browser/ui/views/extensions/extension_dialog_observer.cc',
+        'browser/ui/views/extensions/extension_dialog_observer.h',
+        'browser/ui/views/extensions/extension_install_dialog_view.cc',
+        'browser/ui/views/extensions/extension_installed_bubble.cc',
+        'browser/ui/views/extensions/extension_installed_bubble.h',
+        'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
+        'browser/ui/views/extensions/extension_keybinding_registry_views.h',
+        'browser/ui/views/extensions/extension_popup.cc',
+        'browser/ui/views/extensions/extension_popup.h',
+        'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
+        'browser/ui/views/extensions/extension_view_views.cc',
+        'browser/ui/views/extensions/extension_view_views.h',
+        'browser/ui/views/extensions/media_galleries_dialog_views.cc',
+        'browser/ui/views/extensions/media_galleries_dialog_views.h',
+        'browser/ui/views/extensions/shell_window_frame_view.cc',
+        'browser/ui/views/extensions/shell_window_frame_view.h',
+        'browser/ui/views/external_protocol_dialog.cc',
+        'browser/ui/views/external_protocol_dialog.h',
+        'browser/ui/views/external_tab_container_win.cc',
+        'browser/ui/views/external_tab_container_win.h',
+        'browser/ui/views/find_bar_host.cc',
+        'browser/ui/views/find_bar_host.h',
+        'browser/ui/views/find_bar_host_aura.cc',
+        'browser/ui/views/find_bar_host_win.cc',
+        'browser/ui/views/find_bar_view.cc',
+        'browser/ui/views/find_bar_view.h',
+        'browser/ui/views/first_run_bubble.cc',
+        'browser/ui/views/first_run_bubble.h',
+        'browser/ui/views/frame/app_non_client_frame_view_ash.cc',
+        'browser/ui/views/frame/app_non_client_frame_view_ash.h',
+        'browser/ui/views/frame/app_panel_browser_frame_view.cc',
+        'browser/ui/views/frame/app_panel_browser_frame_view.h',
+        'browser/ui/views/frame/browser_frame.cc',
+        'browser/ui/views/frame/browser_frame.h',
+        'browser/ui/views/frame/browser_frame_aura.cc',
+        'browser/ui/views/frame/browser_frame_aura.h',
+        'browser/ui/views/frame/browser_frame_common_win.cc',
+        'browser/ui/views/frame/browser_frame_common_win.h',
+        'browser/ui/views/frame/browser_frame_win.cc',
+        'browser/ui/views/frame/browser_frame_win.h',
+        'browser/ui/views/frame/browser_non_client_frame_view.cc',
+        'browser/ui/views/frame/browser_non_client_frame_view.h',
+        'browser/ui/views/frame/browser_non_client_frame_view_ash.h',
+        'browser/ui/views/frame/browser_non_client_frame_view_ash.cc',
+        'browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc',
+        'browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc',
+        'browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc',
+        'browser/ui/views/frame/browser_root_view.cc',
+        'browser/ui/views/frame/browser_root_view.h',
+        'browser/ui/views/frame/browser_view.cc',
+        'browser/ui/views/frame/browser_view.h',
+        'browser/ui/views/frame/browser_view_layout.cc',
+        'browser/ui/views/frame/browser_view_layout.h',
+        'browser/ui/views/frame/browser_view_layout_delegate.h',
+        'browser/ui/views/frame/contents_container.cc',
+        'browser/ui/views/frame/contents_container.h',
+        'browser/ui/views/frame/desktop_browser_frame_aura.cc',
+        'browser/ui/views/frame/desktop_browser_frame_aura.h',
+        'browser/ui/views/frame/desktop_user_action_handler_aura.cc',
+        'browser/ui/views/frame/desktop_user_action_handler_aura.h',
+        'browser/ui/views/frame/browser_desktop_root_window_host.h',
+        'browser/ui/views/frame/browser_desktop_root_window_host_win.cc',
+        'browser/ui/views/frame/browser_desktop_root_window_host_win.h',
+        'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc',
+        'browser/ui/views/frame/browser_desktop_root_window_host_x11.h',
+        'browser/ui/views/frame/glass_browser_frame_view.cc',
+        'browser/ui/views/frame/glass_browser_frame_view.h',
+        'browser/ui/views/frame/global_menu_bar_x11.cc',
+        'browser/ui/views/frame/global_menu_bar_x11.h',
+        'browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
+        'browser/ui/views/frame/global_menu_bar_registrar_x11.h',
+        'browser/ui/views/frame/immersive_mode_controller.cc',
+        'browser/ui/views/frame/immersive_mode_controller.h',
+        'browser/ui/views/frame/immersive_mode_controller_ash.cc',
+        'browser/ui/views/frame/immersive_mode_controller_ash.h',
+        'browser/ui/views/frame/immersive_mode_controller_factory.cc',
+        'browser/ui/views/frame/immersive_mode_controller_stub.cc',
+        'browser/ui/views/frame/immersive_mode_controller_stub.h',
+        'browser/ui/views/frame/minimize_button_metrics_win.cc',
+        'browser/ui/views/frame/minimize_button_metrics_win.h',
+        'browser/ui/views/frame/native_browser_frame.h',
+        'browser/ui/views/frame/opaque_browser_frame_view.cc',
+        'browser/ui/views/frame/opaque_browser_frame_view.h',
+        'browser/ui/views/frame/popup_non_client_frame_view.cc',
+        'browser/ui/views/frame/popup_non_client_frame_view.h',
+        'browser/ui/views/frame/scroll_end_effect_controller.h',
+        'browser/ui/views/frame/scroll_end_effect_controller_ash.cc',
+        'browser/ui/views/frame/scroll_end_effect_controller_ash.h',
+        'browser/ui/views/frame/system_menu_insertion_delegate_win.cc',
+        'browser/ui/views/frame/system_menu_insertion_delegate_win.h',
+        'browser/ui/views/frame/system_menu_model_builder.cc',
+        'browser/ui/views/frame/system_menu_model_builder.h',
+        'browser/ui/views/frame/system_menu_model_delegate.cc',
+        'browser/ui/views/frame/system_menu_model_delegate.h',
+        'browser/ui/views/frame/taskbar_decorator.cc',
+        'browser/ui/views/frame/taskbar_decorator.h',
+        'browser/ui/views/frame/taskbar_decorator_win.cc',
+        'browser/ui/views/frame/top_container_view.cc',
+        'browser/ui/views/frame/top_container_view.h',
+        'browser/ui/views/fullscreen_exit_bubble_views.cc',
+        'browser/ui/views/fullscreen_exit_bubble_views.h',
+        'browser/ui/views/global_error_bubble_view.cc',
+        'browser/ui/views/global_error_bubble_view.h',
+        'browser/ui/views/home_button.cc',
+        'browser/ui/views/home_button.h',
+        'browser/ui/views/hung_renderer_view.cc',
+        'browser/ui/views/hung_renderer_view.h',
+        'browser/ui/views/hung_renderer_view_win.cc',
+        'browser/ui/views/hung_renderer_view_win.h',
+        'browser/ui/views/importer/import_lock_dialog_view.cc',
+        'browser/ui/views/importer/import_lock_dialog_view.h',
+        'browser/ui/views/infobars/alternate_nav_infobar_view.cc',
+        'browser/ui/views/infobars/alternate_nav_infobar_view.h',
+        'browser/ui/views/infobars/after_translate_infobar.cc',
+        'browser/ui/views/infobars/after_translate_infobar.h',
+        'browser/ui/views/infobars/before_translate_infobar.cc',
+        'browser/ui/views/infobars/before_translate_infobar.h',
+        'browser/ui/views/infobars/confirm_infobar.cc',
+        'browser/ui/views/infobars/confirm_infobar.h',
+        'browser/ui/views/infobars/extension_infobar.cc',
+        'browser/ui/views/infobars/extension_infobar.h',
+        'browser/ui/views/infobars/infobar_background.cc',
+        'browser/ui/views/infobars/infobar_background.h',
+        'browser/ui/views/infobars/infobar_button_border.cc',
+        'browser/ui/views/infobars/infobar_button_border.h',
+        'browser/ui/views/infobars/infobar_container_view.cc',
+        'browser/ui/views/infobars/infobar_container_view.h',
+        'browser/ui/views/infobars/infobar_label_button_border.cc',
+        'browser/ui/views/infobars/infobar_label_button_border.h',
+        'browser/ui/views/infobars/infobar_view.cc',
+        'browser/ui/views/infobars/infobar_view.h',
+        'browser/ui/views/infobars/translate_infobar_base.cc',
+        'browser/ui/views/infobars/translate_infobar_base.h',
+        'browser/ui/views/infobars/translate_language_menu_model.cc',
+        'browser/ui/views/infobars/translate_language_menu_model.h',
+        'browser/ui/views/infobars/translate_message_infobar.cc',
+        'browser/ui/views/infobars/translate_message_infobar.h',
+        'browser/ui/views/javascript_app_modal_dialog_views.cc',
+        'browser/ui/views/javascript_app_modal_dialog_views.h',
+        'browser/ui/views/load_complete_listener.cc',
+        'browser/ui/views/load_complete_listener.h',
+        'browser/ui/views/location_bar/generated_credit_card_view.cc',
+        'browser/ui/views/location_bar/generated_credit_card_view.h',
+        'browser/ui/views/location_bar/content_setting_image_view.cc',
+        'browser/ui/views/location_bar/content_setting_image_view.h',
+        'browser/ui/views/location_bar/ev_bubble_view.cc',
+        'browser/ui/views/location_bar/ev_bubble_view.h',
+        'browser/ui/views/location_bar/icon_label_bubble_view.cc',
+        'browser/ui/views/location_bar/icon_label_bubble_view.h',
+        'browser/ui/views/location_bar/keyword_hint_view.cc',
+        'browser/ui/views/location_bar/keyword_hint_view.h',
+        'browser/ui/views/location_bar/location_bar_decoration_view.cc',
+        'browser/ui/views/location_bar/location_bar_decoration_view.h',
+        'browser/ui/views/location_bar/location_bar_layout.cc',
+        'browser/ui/views/location_bar/location_bar_layout.h',
+        'browser/ui/views/location_bar/location_bar_view.cc',
+        'browser/ui/views/location_bar/location_bar_view.h',
+        'browser/ui/views/location_bar/location_icon_view.cc',
+        'browser/ui/views/location_bar/location_icon_view.h',
+        'browser/ui/views/location_bar/open_pdf_in_reader_view.cc',
+        'browser/ui/views/location_bar/open_pdf_in_reader_view.h',
+        'browser/ui/views/location_bar/page_action_image_view.cc',
+        'browser/ui/views/location_bar/page_action_image_view.h',
+        'browser/ui/views/location_bar/page_action_with_badge_view.cc',
+        'browser/ui/views/location_bar/page_action_with_badge_view.h',
+        'browser/ui/views/location_bar/page_info_helper.cc',
+        'browser/ui/views/location_bar/page_info_helper.h',
+        'browser/ui/views/location_bar/script_bubble_icon_view.cc',
+        'browser/ui/views/location_bar/script_bubble_icon_view.h',
+        'browser/ui/views/location_bar/selected_keyword_view.cc',
+        'browser/ui/views/location_bar/selected_keyword_view.h',
+        'browser/ui/views/location_bar/star_view.cc',
+        'browser/ui/views/location_bar/star_view.h',
+        'browser/ui/views/location_bar/zoom_bubble_view.cc',
+        'browser/ui/views/location_bar/zoom_bubble_view.h',
+        'browser/ui/views/location_bar/zoom_view.cc',
+        'browser/ui/views/location_bar/zoom_view.h',
+        'browser/ui/views/login_prompt_views.cc',
+        'browser/ui/views/login_view.cc',
+        'browser/ui/views/login_view.h',
+        'browser/ui/views/message_center/message_center_frame_view.cc',
+        'browser/ui/views/message_center/message_center_frame_view.h',
+        'browser/ui/views/message_center/message_center_widget_delegate.h',
+        'browser/ui/views/message_center/message_center_widget_delegate.cc',
+        'browser/ui/views/message_center/web_notification_tray.h',
+        'browser/ui/views/message_center/web_notification_tray.cc',
+        'browser/ui/views/message_center/web_notification_tray_win.cc',
+        'browser/ui/views/native_focus_tracker_views.cc',
+        'browser/ui/views/native_focus_tracker_views.h',
+        'browser/ui/views/native_focus_tracker_views_aura.cc',
+        'browser/ui/views/native_focus_tracker_views_win.cc',
+        'browser/ui/views/notifications/balloon_collection_views.cc',
+        'browser/ui/views/notifications/balloon_view_host.cc',
+        'browser/ui/views/notifications/balloon_view_host.h',
+        'browser/ui/views/notifications/balloon_view_views.cc',
+        'browser/ui/views/notifications/balloon_view_views.h',
+        'browser/ui/views/omnibox/omnibox_popup_contents_view.cc',
+        'browser/ui/views/omnibox/omnibox_popup_contents_view.h',
+        'browser/ui/views/omnibox/omnibox_result_view.cc',
+        'browser/ui/views/omnibox/omnibox_result_view.h',
+        'browser/ui/views/omnibox/omnibox_result_view_model.h',
+        'browser/ui/views/omnibox/omnibox_views.cc',
+        'browser/ui/views/omnibox/omnibox_views.h',
+        'browser/ui/views/omnibox/omnibox_view_views.cc',
+        'browser/ui/views/omnibox/omnibox_view_views.h',
+        'browser/ui/views/omnibox/omnibox_view_win.cc',
+        'browser/ui/views/omnibox/omnibox_view_win.h',
+        'browser/ui/views/omnibox/touch_omnibox_popup_contents_view.cc',
+        'browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h',
+        'browser/ui/views/open_pdf_in_reader_bubble_view.cc',
+        'browser/ui/views/open_pdf_in_reader_bubble_view.h',
+        'browser/ui/views/panels/panel_frame_view.cc',
+        'browser/ui/views/panels/panel_frame_view.h',
+        'browser/ui/views/panels/panel_stack_view.cc',
+        'browser/ui/views/panels/panel_stack_view.h',
+        'browser/ui/views/panels/panel_view.cc',
+        'browser/ui/views/panels/panel_view.h',
+        'browser/ui/views/panels/taskbar_window_thumbnailer_win.cc',
+        'browser/ui/views/panels/taskbar_window_thumbnailer_win.h',
+        'browser/ui/views/password_generation_bubble_view.cc',
+        'browser/ui/views/password_generation_bubble_view.h',
+        'browser/ui/views/profile_chooser_view.cc',
+        'browser/ui/views/profile_chooser_view.h',
+        'browser/ui/views/reload_button.cc',
+        'browser/ui/views/reload_button.h',
+        'browser/ui/views/sad_tab_view.cc',
+        'browser/ui/views/sad_tab_view.h',
+        'browser/ui/views/screen_capture_notification_ui_views.cc',
+        'browser/ui/views/script_bubble_view.cc',
+        'browser/ui/views/script_bubble_view.h',
+        'browser/ui/views/select_file_dialog_extension.cc',
+        'browser/ui/views/select_file_dialog_extension.h',
+        'browser/ui/views/select_file_dialog_extension_factory.cc',
+        'browser/ui/views/select_file_dialog_extension_factory.h',
+        'browser/ui/views/simple_message_box_views.cc',
+        'browser/ui/views/simple_message_box_win.cc',
+        'browser/ui/views/speech_recognition_bubble_views.cc',
+        'browser/ui/views/ssl_client_certificate_selector.cc',
+        'browser/ui/views/ssl_client_certificate_selector.h',
+        'browser/ui/views/status_bubble_views.cc',
+        'browser/ui/views/status_bubble_views.h',
+        'browser/ui/views/status_icons/status_icon_linux_wrapper.cc',
+        'browser/ui/views/status_icons/status_icon_linux_wrapper.h',
+        'browser/ui/views/status_icons/status_icon_win.cc',
+        'browser/ui/views/status_icons/status_icon_win.h',
+        'browser/ui/views/status_icons/status_tray_linux.cc',
+        'browser/ui/views/status_icons/status_tray_linux.h',
+        'browser/ui/views/status_icons/status_tray_win.cc',
+        'browser/ui/views/status_icons/status_tray_win.h',
+        'browser/ui/views/stubs_aura.cc',
+        'browser/ui/views/sync/one_click_signin_bubble_view.cc',
+        'browser/ui/views/sync/one_click_signin_bubble_view.h',
+        'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc',
+        'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h',
+        'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
+        'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
+        'browser/ui/views/tab_contents/render_view_context_menu_views.cc',
+        'browser/ui/views/tab_contents/render_view_context_menu_views.h',
+        'browser/ui/views/tab_contents/render_view_context_menu_win.cc',
+        'browser/ui/views/tab_contents/render_view_context_menu_win.h',
+        'browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc',
+        'browser/ui/views/tab_contents/web_drag_bookmark_handler_win.h',
+        'browser/ui/views/tab_icon_view.cc',
+        'browser/ui/views/tab_icon_view.h',
+        'browser/ui/views/tab_modal_confirm_dialog_views.cc',
+        'browser/ui/views/tab_modal_confirm_dialog_views.h',
+        'browser/ui/views/tabs/browser_tab_strip_controller.cc',
+        'browser/ui/views/tabs/browser_tab_strip_controller.h',
+        'browser/ui/views/tabs/dock_info_views.cc',
+        'browser/ui/views/tabs/dock_info_win.cc',
+        'browser/ui/views/tabs/dragged_tab_view.cc',
+        'browser/ui/views/tabs/dragged_tab_view.h',
+        'browser/ui/views/tabs/native_view_photobooth.h',
+        'browser/ui/views/tabs/native_view_photobooth_win.cc',
+        'browser/ui/views/tabs/native_view_photobooth_win.h',
+        'browser/ui/views/tabs/stacked_tab_strip_layout.cc',
+        'browser/ui/views/tabs/stacked_tab_strip_layout.h',
+        'browser/ui/views/tabs/tab.cc',
+        'browser/ui/views/tabs/tab.h',
+        'browser/ui/views/tabs/tab_controller.h',
+        'browser/ui/views/tabs/tab_drag_controller.cc',
+        'browser/ui/views/tabs/tab_drag_controller.h',
+        'browser/ui/views/tabs/tab_strip.cc',
+        'browser/ui/views/tabs/tab_strip.h',
+        'browser/ui/views/tabs/tab_strip_controller.h',
+        'browser/ui/views/task_manager_view.cc',
+        'browser/ui/views/theme_image_mapper.cc',
+        'browser/ui/views/theme_image_mapper.h',
+        'browser/ui/views/theme_image_mapper_aura_win.cc',
+        'browser/ui/views/toolbar_view.cc',
+        'browser/ui/views/toolbar_view.h',
+        'browser/ui/views/top_level_widget_views.cc',
+        'browser/ui/views/touch_uma/touch_uma.h',
+        'browser/ui/views/uninstall_view.cc',
+        'browser/ui/views/uninstall_view.h',
+        'browser/ui/views/update_recommended_message_box.cc',
+        'browser/ui/views/update_recommended_message_box.h',
+        'browser/ui/views/outdated_upgrade_bubble_view.h',
+        'browser/ui/views/outdated_upgrade_bubble_view.cc',
+        'browser/ui/views/user_data_dir_dialog_view.cc',
+        'browser/ui/views/user_data_dir_dialog_view.h',
+        'browser/ui/views/validation_message_bubble_delegate.h',
+        'browser/ui/views/validation_message_bubble_delegate.cc',
+        'browser/ui/views/validation_message_bubble_view.cc',
+        'browser/ui/views/web_contents_modal_dialog_manager_views.cc',
+        'browser/ui/views/website_settings/permission_selector_view.cc',
+        'browser/ui/views/website_settings/permission_selector_view.h',
+        'browser/ui/views/website_settings/permission_selector_view_observer.h',
+        'browser/ui/views/website_settings/website_settings_popup_view.cc',
+        'browser/ui/views/website_settings/website_settings_popup_view.h',
+        'browser/ui/views/wrench_menu.cc',
+        'browser/ui/views/wrench_menu.h',
+        'browser/ui/views/wrench_toolbar_button.cc',
+        'browser/ui/views/wrench_toolbar_button.h',
+        'browser/ui/web_applications/web_app_ui.cc',
+        'browser/ui/web_applications/web_app_ui.h',
+        'browser/ui/website_settings/permission_menu_model.cc',
+        'browser/ui/website_settings/permission_menu_model.h',
+        'browser/ui/website_settings/website_settings.cc',
+        'browser/ui/website_settings/website_settings.h',
+        'browser/ui/website_settings/website_settings_infobar_delegate.cc',
+        'browser/ui/website_settings/website_settings_infobar_delegate.h',
+        'browser/ui/website_settings/website_settings_ui.cc',
+        'browser/ui/website_settings/website_settings_ui.h',
+        'browser/ui/website_settings/website_settings_utils.cc',
+        'browser/ui/website_settings/website_settings_utils.h',
+        'browser/ui/webui/about_ui.cc',
+        'browser/ui/webui/about_ui.h',
+        'browser/ui/webui/app_launcher_page_ui.cc',
+        'browser/ui/webui/app_launcher_page_ui.h',
+        'browser/ui/webui/bookmarks_ui.cc',
+        'browser/ui/webui/bookmarks_ui.h',
+        'browser/ui/webui/certificate_viewer_webui.cc',
+        'browser/ui/webui/certificate_viewer_webui.h',
+        'browser/ui/webui/certificate_viewer_ui.cc',
+        'browser/ui/webui/certificate_viewer_ui.h',
+        'browser/ui/webui/chrome_web_contents_handler.cc',
+        'browser/ui/webui/chrome_web_contents_handler.h',
+        'browser/ui/webui/chrome_web_ui_controller_factory.cc',
+        'browser/ui/webui/chrome_web_ui_controller_factory.h',
+        'browser/ui/webui/chromeos/app_launch_ui.cc',
+        'browser/ui/webui/chromeos/app_launch_ui.h',
+        'browser/ui/webui/chromeos/bluetooth_pairing_ui.cc',
+        'browser/ui/webui/chromeos/bluetooth_pairing_ui.h',
+        'browser/ui/webui/chromeos/choose_mobile_network_ui.cc',
+        'browser/ui/webui/chromeos/choose_mobile_network_ui.h',
+        'browser/ui/webui/chromeos/cryptohome_ui.cc',
+        'browser/ui/webui/chromeos/cryptohome_ui.h',
+        'browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc',
+        'browser/ui/webui/chromeos/cryptohome_web_ui_handler.h',
+        'browser/ui/webui/chromeos/diagnostics/diagnostics_ui.cc',
+        'browser/ui/webui/chromeos/diagnostics/diagnostics_ui.h',
+        'browser/ui/webui/chromeos/drive_internals_ui.cc',
+        'browser/ui/webui/chromeos/drive_internals_ui.h',
+        'browser/ui/webui/chromeos/imageburner/imageburner_ui.cc',
+        'browser/ui/webui/chromeos/imageburner/imageburner_ui.h',
+        'browser/ui/webui/chromeos/keyboard_overlay_ui.cc',
+        'browser/ui/webui/chromeos/keyboard_overlay_ui.h',
+        'browser/ui/webui/chromeos/login/base_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/base_screen_handler.h',
+        'browser/ui/webui/chromeos/login/base_screen_handler_utils.h',
+        'browser/ui/webui/chromeos/login/core_oobe_handler.cc',
+        'browser/ui/webui/chromeos/login/core_oobe_handler.h',
+        'browser/ui/webui/chromeos/login/enrollment_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/enrollment_screen_handler.h',
+        'browser/ui/webui/chromeos/login/error_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/error_screen_handler.h',
+        'browser/ui/webui/chromeos/login/eula_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/eula_screen_handler.h',
+        'browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc',
+        'browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h',
+        'browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h',
+        'browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h',
+        'browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h',
+        'browser/ui/webui/chromeos/login/network_dropdown.cc',
+        'browser/ui/webui/chromeos/login/network_dropdown.h',
+        'browser/ui/webui/chromeos/login/network_dropdown_handler.cc',
+        'browser/ui/webui/chromeos/login/network_dropdown_handler.h',
+        'browser/ui/webui/chromeos/login/network_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/network_screen_handler.h',
+        'browser/ui/webui/chromeos/login/network_state_informer.cc',
+        'browser/ui/webui/chromeos/login/network_state_informer.h',
+        'browser/ui/webui/chromeos/login/oobe_ui.cc',
+        'browser/ui/webui/chromeos/login/oobe_ui.h',
+        'browser/ui/webui/chromeos/login/reset_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/reset_screen_handler.h',
+        'browser/ui/webui/chromeos/login/screen_manager_handler.cc',
+        'browser/ui/webui/chromeos/login/screen_manager_handler.h',
+        'browser/ui/webui/chromeos/login/signin_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/signin_screen_handler.h',
+        'browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h',
+        'browser/ui/webui/chromeos/login/update_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/update_screen_handler.h',
+        'browser/ui/webui/chromeos/login/user_image_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/user_image_screen_handler.h',
+        'browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h',
+        'browser/ui/webui/chromeos/mobile_setup_dialog.cc',
+        'browser/ui/webui/chromeos/mobile_setup_dialog.h',
+        'browser/ui/webui/chromeos/mobile_setup_ui.cc',
+        'browser/ui/webui/chromeos/mobile_setup_ui.h',
+        'browser/ui/webui/chromeos/network_ui.cc',
+        'browser/ui/webui/chromeos/network_ui.h',
+        'browser/ui/webui/chromeos/proxy_settings_ui.cc',
+        'browser/ui/webui/chromeos/proxy_settings_ui.h',
+        'browser/ui/webui/chromeos/sim_unlock_ui.cc',
+        'browser/ui/webui/chromeos/sim_unlock_ui.h',
+        'browser/ui/webui/chromeos/slow_ui.cc',
+        'browser/ui/webui/chromeos/slow_ui.h',
+        'browser/ui/webui/chromeos/system_info_ui.cc',
+        'browser/ui/webui/chromeos/system_info_ui.h',
+        'browser/ui/webui/chromeos/ui_account_tweaks.cc',
+        'browser/ui/webui/chromeos/ui_account_tweaks.h',
+        'browser/ui/webui/constrained_web_dialog_ui.cc',
+        'browser/ui/webui/constrained_web_dialog_ui.h',
+        'browser/ui/webui/constrained_web_dialog_delegate_base.cc',
+        'browser/ui/webui/constrained_web_dialog_delegate_base.h',
+        'browser/ui/webui/cookies_tree_model_util.cc',
+        'browser/ui/webui/cookies_tree_model_util.h',
+        'browser/ui/webui/crashes_ui.cc',
+        'browser/ui/webui/crashes_ui.h',
+        'browser/ui/webui/devtools_ui.cc',
+        'browser/ui/webui/devtools_ui.h',
+        'browser/ui/webui/downloads_dom_handler.cc',
+        'browser/ui/webui/downloads_dom_handler.h',
+        'browser/ui/webui/downloads_ui.cc',
+        'browser/ui/webui/downloads_ui.h',
+        'browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc',
+        'browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h',
+        'browser/ui/webui/extensions/command_handler.cc',
+        'browser/ui/webui/extensions/command_handler.h',
+        'browser/ui/webui/extensions/extension_basic_info.cc',
+        'browser/ui/webui/extensions/extension_basic_info.h',
+        'browser/ui/webui/extensions/extension_icon_source.cc',
+        'browser/ui/webui/extensions/extension_icon_source.h',
+        'browser/ui/webui/extensions/extension_info_ui.cc',
+        'browser/ui/webui/extensions/extension_info_ui.h',
+        'browser/ui/webui/extensions/extension_settings_handler.cc',
+        'browser/ui/webui/extensions/extension_settings_handler.h',
+        'browser/ui/webui/extensions/extensions_ui.cc',
+        'browser/ui/webui/extensions/extensions_ui.h',
+        'browser/ui/webui/extensions/install_extension_handler.cc',
+        'browser/ui/webui/extensions/install_extension_handler.h',
+        'browser/ui/webui/extensions/pack_extension_handler.cc',
+        'browser/ui/webui/extensions/pack_extension_handler.h',
+        'browser/ui/webui/favicon_source.cc',
+        'browser/ui/webui/favicon_source.h',
+        'browser/ui/webui/feedback_ui.cc',
+        'browser/ui/webui/feedback_ui.h',
+        'browser/ui/webui/fileicon_source.cc',
+        'browser/ui/webui/fileicon_source.h',
+        'browser/ui/webui/flags_ui.cc',
+        'browser/ui/webui/flags_ui.h',
+        'browser/ui/webui/flash_ui.cc',
+        'browser/ui/webui/flash_ui.h',
+        'browser/ui/webui/gesture_config_ui.cc',
+        'browser/ui/webui/gesture_config_ui.h',
+        'browser/ui/webui/chromeos/salsa_ui.cc',
+        'browser/ui/webui/chromeos/salsa_ui.h',
+        'browser/ui/webui/help/help_handler.cc',
+        'browser/ui/webui/help/help_handler.h',
+        'browser/ui/webui/help/help_ui.cc',
+        'browser/ui/webui/help/help_ui.h',
+        'browser/ui/webui/help/help_utils_chromeos.cc',
+        'browser/ui/webui/help/help_utils_chromeos.h',
+        'browser/ui/webui/help/version_updater.h',
+        'browser/ui/webui/help/version_updater_basic.cc',
+        'browser/ui/webui/help/version_updater_basic.h',
+        'browser/ui/webui/help/version_updater_chromeos.cc',
+        'browser/ui/webui/help/version_updater_chromeos.h',
+        'browser/ui/webui/help/version_updater_mac.h',
+        'browser/ui/webui/help/version_updater_mac.mm',
+        'browser/ui/webui/help/version_updater_win.cc',
+        'browser/ui/webui/history_ui.cc',
+        'browser/ui/webui/history_ui.h',
+        'browser/ui/webui/identity_internals_ui.cc',
+        'browser/ui/webui/identity_internals_ui.h',
+        'browser/ui/webui/inline_login_ui.cc',
+        'browser/ui/webui/inline_login_ui.h',
+        'browser/ui/webui/inspect_ui.cc',
+        'browser/ui/webui/inspect_ui.h',
+        'browser/ui/webui/instant_ui.cc',
+        'browser/ui/webui/instant_ui.h',
+        'browser/ui/webui/media/webrtc_logs_ui.cc',
+        'browser/ui/webui/media/webrtc_logs_ui.h',
+        'browser/ui/webui/memory_internals/memory_internals_handler.cc',
+        'browser/ui/webui/memory_internals/memory_internals_handler.h',
+        'browser/ui/webui/memory_internals/memory_internals_proxy.cc',
+        'browser/ui/webui/memory_internals/memory_internals_proxy.h',
+        'browser/ui/webui/memory_internals/memory_internals_ui.cc',
+        'browser/ui/webui/memory_internals/memory_internals_ui.h',
+        'browser/ui/webui/metrics_handler.cc',
+        'browser/ui/webui/metrics_handler.h',
+        'browser/ui/webui/nacl_ui.cc',
+        'browser/ui/webui/nacl_ui.h',
+        'browser/ui/webui/net_export_ui.cc',
+        'browser/ui/webui/net_export_ui.h',
+        'browser/ui/webui/net_internals/net_internals_ui.cc',
+        'browser/ui/webui/net_internals/net_internals_ui.h',
+        'browser/ui/webui/ntp/app_launcher_handler.cc',
+        'browser/ui/webui/ntp/app_launcher_handler.h',
+        'browser/ui/webui/ntp/core_app_launcher_handler.cc',
+        'browser/ui/webui/ntp/core_app_launcher_handler.h',
+        'browser/ui/webui/ntp/app_resource_cache_factory.cc',
+        'browser/ui/webui/ntp/app_resource_cache_factory.h',
+        'browser/ui/webui/ntp/favicon_webui_handler.cc',
+        'browser/ui/webui/ntp/favicon_webui_handler.h',
+        'browser/ui/webui/ntp/foreign_session_handler.cc',
+        'browser/ui/webui/ntp/foreign_session_handler.h',
+        'browser/ui/webui/ntp/most_visited_handler.cc',
+        'browser/ui/webui/ntp/most_visited_handler.h',
+        'browser/ui/webui/ntp/new_tab_page_handler.cc',
+        'browser/ui/webui/ntp/new_tab_page_handler.h',
+        'browser/ui/webui/ntp/new_tab_page_sync_handler.cc',
+        'browser/ui/webui/ntp/new_tab_page_sync_handler.h',
+        'browser/ui/webui/ntp/new_tab_ui.cc',
+        'browser/ui/webui/ntp/new_tab_ui.h',
+        'browser/ui/webui/ntp/ntp_login_handler.cc',
+        'browser/ui/webui/ntp/ntp_login_handler.h',
+        'browser/ui/webui/ntp/ntp_resource_cache.cc',
+        'browser/ui/webui/ntp/ntp_resource_cache.h',
+        'browser/ui/webui/ntp/ntp_resource_cache_factory.cc',
+        'browser/ui/webui/ntp/ntp_resource_cache_factory.h',
+        'browser/ui/webui/ntp/ntp_stats.h',
+        'browser/ui/webui/ntp/ntp_user_data_logger.cc',
+        'browser/ui/webui/ntp/ntp_user_data_logger.h',
+        'browser/ui/webui/ntp/recently_closed_tabs_handler.cc',
+        'browser/ui/webui/ntp/recently_closed_tabs_handler.h',
+        'browser/ui/webui/ntp/suggestions_combiner.cc',
+        'browser/ui/webui/ntp/suggestions_combiner.h',
+        'browser/ui/webui/ntp/suggestions_page_handler.cc',
+        'browser/ui/webui/ntp/suggestions_page_handler.h',
+        'browser/ui/webui/ntp/suggestions_source.h',
+        'browser/ui/webui/ntp/suggestions_source_discovery.cc',
+        'browser/ui/webui/ntp/suggestions_source_discovery.h',
+        'browser/ui/webui/ntp/suggestions_source_top_sites.cc',
+        'browser/ui/webui/ntp/suggestions_source_top_sites.h',
+        'browser/ui/webui/ntp/thumbnail_source.cc',
+        'browser/ui/webui/ntp/thumbnail_source.h',
+        'browser/ui/webui/omnibox/omnibox_ui.cc',
+        'browser/ui/webui/omnibox/omnibox_ui.h',
+        'browser/ui/webui/omnibox/omnibox_ui_handler.cc',
+        'browser/ui/webui/omnibox/omnibox_ui_handler.h',
+        'browser/ui/webui/options/advanced_options_utils.h',
+        'browser/ui/webui/options/advanced_options_utils_mac.mm',
+        'browser/ui/webui/options/advanced_options_utils_win.cc',
+        'browser/ui/webui/options/advanced_options_utils_x11.cc',
+        'browser/ui/webui/options/autofill_options_handler.cc',
+        'browser/ui/webui/options/autofill_options_handler.h',
+        'browser/ui/webui/options/browser_options_handler.cc',
+        'browser/ui/webui/options/browser_options_handler.h',
+        'browser/ui/webui/options/certificate_manager_handler.cc',
+        'browser/ui/webui/options/certificate_manager_handler.h',
+        'browser/ui/webui/options/chromeos/accounts_options_handler.cc',
+        'browser/ui/webui/options/chromeos/accounts_options_handler.h',
+        'browser/ui/webui/options/chromeos/bluetooth_options_handler.cc',
+        'browser/ui/webui/options/chromeos/bluetooth_options_handler.h',
+        'browser/ui/webui/options/chromeos/change_picture_options_handler.cc',
+        'browser/ui/webui/options/chromeos/change_picture_options_handler.h',
+        'browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc',
+        'browser/ui/webui/options/chromeos/core_chromeos_options_handler.h',
+        'browser/ui/webui/options/chromeos/cros_language_options_handler.cc',
+        'browser/ui/webui/options/chromeos/cros_language_options_handler.h',
+        'browser/ui/webui/options/chromeos/display_options_handler.cc',
+        'browser/ui/webui/options/chromeos/display_options_handler.h',
+        'browser/ui/webui/options/chromeos/display_overscan_handler.cc',
+        'browser/ui/webui/options/chromeos/display_overscan_handler.h',
+        'browser/ui/webui/options/chromeos/internet_options_handler.cc',
+        'browser/ui/webui/options/chromeos/internet_options_handler.h',
+        'browser/ui/webui/options/chromeos/keyboard_handler.cc',
+        'browser/ui/webui/options/chromeos/keyboard_handler.h',
+        'browser/ui/webui/options/chromeos/language_chewing_handler.cc',
+        'browser/ui/webui/options/chromeos/language_chewing_handler.h',
+        'browser/ui/webui/options/chromeos/language_hangul_handler.cc',
+        'browser/ui/webui/options/chromeos/language_hangul_handler.h',
+        'browser/ui/webui/options/chromeos/language_mozc_handler.cc',
+        'browser/ui/webui/options/chromeos/language_mozc_handler.h',
+        'browser/ui/webui/options/chromeos/language_options_util.cc',
+        'browser/ui/webui/options/chromeos/language_options_util.h',
+        'browser/ui/webui/options/chromeos/language_pinyin_handler.cc',
+        'browser/ui/webui/options/chromeos/language_pinyin_handler.h',
+        'browser/ui/webui/options/chromeos/pointer_handler.cc',
+        'browser/ui/webui/options/chromeos/pointer_handler.h',
+        'browser/ui/webui/options/chromeos/proxy_handler.cc',
+        'browser/ui/webui/options/chromeos/proxy_handler.h',
+        'browser/ui/webui/options/chromeos/stats_options_handler.cc',
+        'browser/ui/webui/options/chromeos/stats_options_handler.h',
+        'browser/ui/webui/options/chromeos/timezone_options_util.cc',
+        'browser/ui/webui/options/chromeos/timezone_options_util.h',
+        'browser/ui/webui/options/chromeos/user_image_source.cc',
+        'browser/ui/webui/options/chromeos/user_image_source.h',
+        'browser/ui/webui/options/clear_browser_data_handler.cc',
+        'browser/ui/webui/options/clear_browser_data_handler.h',
+        'browser/ui/webui/options/content_settings_handler.cc',
+        'browser/ui/webui/options/content_settings_handler.h',
+        'browser/ui/webui/options/cookies_view_handler.cc',
+        'browser/ui/webui/options/cookies_view_handler.h',
+        'browser/ui/webui/options/core_options_handler.cc',
+        'browser/ui/webui/options/core_options_handler.h',
+        'browser/ui/webui/options/font_settings_handler.cc',
+        'browser/ui/webui/options/font_settings_handler.h',
+        'browser/ui/webui/options/font_settings_utils.h',
+        'browser/ui/webui/options/font_settings_utils_linux.cc',
+        'browser/ui/webui/options/font_settings_utils_mac.mm',
+        'browser/ui/webui/options/font_settings_utils_win.cc',
+        'browser/ui/webui/options/geolocation_options_handler.cc',
+        'browser/ui/webui/options/geolocation_options_handler.h',
+        'browser/ui/webui/options/handler_options_handler.cc',
+        'browser/ui/webui/options/handler_options_handler.h',
+        'browser/ui/webui/options/home_page_overlay_handler.cc',
+        'browser/ui/webui/options/home_page_overlay_handler.h',
+        'browser/ui/webui/options/import_data_handler.cc',
+        'browser/ui/webui/options/import_data_handler.h',
+        'browser/ui/webui/options/language_dictionary_overlay_handler.cc',
+        'browser/ui/webui/options/language_dictionary_overlay_handler.h',
+        'browser/ui/webui/options/language_options_handler.cc',
+        'browser/ui/webui/options/language_options_handler.h',
+        'browser/ui/webui/options/language_options_handler_common.cc',
+        'browser/ui/webui/options/language_options_handler_common.h',
+        'browser/ui/webui/options/managed_user_create_confirm_handler.cc',
+        'browser/ui/webui/options/managed_user_create_confirm_handler.h',
+        'browser/ui/webui/options/managed_user_learn_more_handler.cc',
+        'browser/ui/webui/options/managed_user_learn_more_handler.h',
+        'browser/ui/webui/options/manage_profile_handler.cc',
+        'browser/ui/webui/options/manage_profile_handler.h',
+        'browser/ui/webui/options/media_devices_selection_handler.cc',
+        'browser/ui/webui/options/media_devices_selection_handler.h',
+        'browser/ui/webui/options/media_galleries_handler.cc',
+        'browser/ui/webui/options/media_galleries_handler.h',
+        'browser/ui/webui/options/options_ui.cc',
+        'browser/ui/webui/options/options_ui.h',
+        'browser/ui/webui/options/password_manager_handler.cc',
+        'browser/ui/webui/options/password_manager_handler.h',
+        'browser/ui/webui/options/pepper_flash_content_settings_utils.cc',
+        'browser/ui/webui/options/pepper_flash_content_settings_utils.h',
+        'browser/ui/webui/options/reset_profile_settings_handler.cc',
+        'browser/ui/webui/options/reset_profile_settings_handler.h',
+        'browser/ui/webui/options/search_engine_manager_handler.cc',
+        'browser/ui/webui/options/search_engine_manager_handler.h',
+        'browser/ui/webui/options/startup_pages_handler.cc',
+        'browser/ui/webui/options/startup_pages_handler.h',
+        'browser/ui/webui/performance_monitor/performance_monitor_l10n.cc',
+        'browser/ui/webui/performance_monitor/performance_monitor_l10n.h',
+        'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.cc',
+        'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.h',
+        'browser/ui/webui/performance_monitor/performance_monitor_ui_util.cc',
+        'browser/ui/webui/performance_monitor/performance_monitor_ui_util.h',
+        'browser/ui/webui/performance_monitor/performance_monitor_ui.cc',
+        'browser/ui/webui/performance_monitor/performance_monitor_ui.h',
+        'browser/ui/webui/performance_monitor/performance_monitor_handler.cc',
+        'browser/ui/webui/performance_monitor/performance_monitor_handler.h',
+        'browser/ui/webui/plugins_ui.cc',
+        'browser/ui/webui/plugins_ui.h',
+        'browser/ui/webui/policy_ui.cc',
+        'browser/ui/webui/policy_ui.h',
+        'browser/ui/webui/predictors/predictors_handler.cc',
+        'browser/ui/webui/predictors/predictors_handler.h',
+        'browser/ui/webui/predictors/predictors_ui.cc',
+        'browser/ui/webui/predictors/predictors_ui.h',
+        'browser/ui/webui/print_preview/print_preview_handler.cc',
+        'browser/ui/webui/print_preview/print_preview_handler.h',
+        'browser/ui/webui/print_preview/print_preview_ui.cc',
+        'browser/ui/webui/print_preview/print_preview_ui.h',
+        'browser/ui/webui/print_preview/sticky_settings.cc',
+        'browser/ui/webui/print_preview/sticky_settings.h',
+        'browser/ui/webui/profiler_ui.cc',
+        'browser/ui/webui/profiler_ui.h',
+        'browser/ui/webui/quota_internals/quota_internals_handler.cc',
+        'browser/ui/webui/quota_internals/quota_internals_handler.h',
+        'browser/ui/webui/quota_internals/quota_internals_proxy.cc',
+        'browser/ui/webui/quota_internals/quota_internals_proxy.h',
+        'browser/ui/webui/quota_internals/quota_internals_types.cc',
+        'browser/ui/webui/quota_internals/quota_internals_types.h',
+        'browser/ui/webui/quota_internals/quota_internals_ui.cc',
+        'browser/ui/webui/quota_internals/quota_internals_ui.h',
+        'browser/ui/webui/screenshot_source.cc',
+        'browser/ui/webui/screenshot_source.h',
+        'browser/ui/webui/set_as_default_browser_ui.cc',
+        'browser/ui/webui/set_as_default_browser_ui.h',
+        'browser/ui/webui/signin/login_ui_service.cc',
+        'browser/ui/webui/signin/login_ui_service.h',
+        'browser/ui/webui/signin/login_ui_service_factory.cc',
+        'browser/ui/webui/signin/login_ui_service_factory.h',
+        'browser/ui/webui/signin/profile_signin_confirmation_dialog.h',
+        'browser/ui/webui/signin/profile_signin_confirmation_dialog.cc',
+        'browser/ui/webui/signin/profile_signin_confirmation_ui.h',
+        'browser/ui/webui/signin/profile_signin_confirmation_ui.cc',
+        'browser/ui/webui/signin/user_manager_screen_handler.h',
+        'browser/ui/webui/signin/user_manager_screen_handler.cc',
+        'browser/ui/webui/signin/user_manager_ui.h',
+        'browser/ui/webui/signin/user_manager_ui.cc',
+        'browser/ui/webui/signin_internals_ui.cc',
+        'browser/ui/webui/signin_internals_ui.h',
+        'browser/ui/webui/suggestions_internals/suggestions_internals_ui.cc',
+        'browser/ui/webui/suggestions_internals/suggestions_internals_ui.h',
+        'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.cc',
+        'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.h',
+        'browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc',
+        'browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h',
+        'browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc',
+        'browser/ui/webui/sync_file_system_internals/file_metadata_handler.h',
+        'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc',
+        'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h',
+        'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.cc',
+        'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h',
+        'browser/ui/webui/sync_internals_ui.cc',
+        'browser/ui/webui/sync_internals_ui.h',
+        'browser/ui/webui/sync_setup_handler.cc',
+        'browser/ui/webui/sync_setup_handler.h',
+        'browser/ui/webui/task_manager/task_manager_dialog.cc',
+        'browser/ui/webui/task_manager/task_manager_dialog.h',
+        'browser/ui/webui/task_manager/task_manager_handler.cc',
+        'browser/ui/webui/task_manager/task_manager_handler.h',
+        'browser/ui/webui/task_manager/task_manager_ui.cc',
+        'browser/ui/webui/task_manager/task_manager_ui.h',
+        'browser/ui/webui/theme_handler.cc',
+        'browser/ui/webui/theme_handler.h',
+        'browser/ui/webui/theme_source.cc',
+        'browser/ui/webui/theme_source.h',
+        'browser/ui/webui/translate_internals/translate_internals_handler.cc',
+        'browser/ui/webui/translate_internals/translate_internals_handler.h',
+        'browser/ui/webui/translate_internals/translate_internals_ui.cc',
+        'browser/ui/webui/translate_internals/translate_internals_ui.h',
+        'browser/ui/webui/uber/uber_ui.cc',
+        'browser/ui/webui/uber/uber_ui.h',
+        'browser/ui/webui/user_actions/user_actions_ui.cc',
+        'browser/ui/webui/user_actions/user_actions_ui.h',
+        'browser/ui/webui/user_actions/user_actions_ui_handler.cc',
+        'browser/ui/webui/user_actions/user_actions_ui_handler.h',
+        'browser/ui/webui/version_handler.cc',
+        'browser/ui/webui/version_handler.h',
+        'browser/ui/webui/version_handler_chromeos.cc',
+        'browser/ui/webui/version_handler_chromeos.h',
+        'browser/ui/webui/version_ui.cc',
+        'browser/ui/webui/version_ui.h',
+        'browser/ui/webui/welcome_handler_android.cc',
+        'browser/ui/webui/welcome_handler_android.h',
+        'browser/ui/webui/welcome_ui_android.cc',
+        'browser/ui/webui/welcome_ui_android.h',
+        'browser/ui/window_sizer/window_sizer.cc',
+        'browser/ui/window_sizer/window_sizer.h',
+        'browser/ui/window_sizer/window_sizer_ash.cc',
+        'browser/ui/window_sizer/window_sizer_aura.cc',
+        'browser/ui/window_sizer/window_sizer_gtk.cc',
+        'browser/ui/window_sizer/window_sizer_mac.mm',
+        'browser/ui/window_sizer/window_sizer_win.cc',
+        'browser/ui/window_snapshot/window_snapshot.cc',
+        'browser/ui/window_snapshot/window_snapshot.h',
+        'browser/ui/zoom/zoom_controller.cc',
+        'browser/ui/zoom/zoom_controller.h',
+        'browser/ui/zoom/zoom_observer.h',
+      ],
+      'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            'browser_extensions',
+            'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
+            'common/extensions/api/api.gyp:api',
+            'debugger',
+            'installer_util',
+            '../components/components.gyp:autofill_content_risk_proto',
+            '../components/component_strings.gyp:component_strings',
+            '../device/bluetooth/bluetooth.gyp:device_bluetooth',
+            '../net/net.gyp:net_with_v8',
+            '../printing/printing.gyp:printing',
+            '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
+            '../third_party/expat/expat.gyp:expat',
+            '../third_party/hunspell/hunspell.gyp:hunspell',
+            '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+            '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+            '../third_party/npapi/npapi.gyp:npapi',
+            '../third_party/re2/re2.gyp:re2',
+            '../ui/compositor/compositor.gyp:compositor',
+            '../ui/surface/surface.gyp:surface',
+            '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
+            '../v8/tools/gyp/v8.gyp:v8',
+            '../webkit/common/webkit_common.gyp:webkit_common',
+            '../webkit/storage_browser.gyp:webkit_storage_browser',
+            '../webkit/storage_common.gyp:webkit_storage_common',
+            '../webkit/webkit_resources.gyp:webkit_resources',
+          ],
+          'defines': [
+            '<@(nacl_defines)',
+          ],
+          'direct_dependent_settings': {
+            'defines': [
+              '<@(nacl_defines)',
+            ],
+          },
+        }, {  # OS == "ios"
+          'dependencies': [
+            '../net/net.gyp:net',
+          ],
+          'sources/': [
+            # iOS uses only small portions of browser/ui/.
+            ['exclude', '\\.(cc|mm)$'],
+            ['include', '_ios\\.(cc|mm)$'],
+            ['include', '(^|/)ios/'],
+            # TODO(ios): Add files here as they are updated to compile on iOS.
+            ['include', '^browser/ui/profile_error_dialog\\.cc$'],
+          ],
+        }],
+        ['OS!="ios" and chrome_multiple_dll!=1', {
+          'dependencies': [
+            '../webkit/support/webkit_support.gyp:glue',
+          ],
+        }],
+        ['OS == "android"', {
+          'dependencies': [
+            '../third_party/openssl/openssl.gyp:openssl',
+          ],
+        }],
+        ['enable_one_click_signin==0', {
+          'sources!': [
+            'browser/ui/cocoa/one_click_signin_bubble_controller.h',
+            'browser/ui/cocoa/one_click_signin_bubble_controller.mm',
+            'browser/ui/gtk/one_click_signin_bubble_gtk.cc',
+            'browser/ui/gtk/one_click_signin_bubble_gtk.h',
+            'browser/ui/sync/one_click_signin_bubble_delegate.h',
+            'browser/ui/sync/one_click_signin_bubble_links_delegate.cc',
+            'browser/ui/sync/one_click_signin_bubble_links_delegate.h',
+            'browser/ui/sync/one_click_signin_helper.cc',
+            'browser/ui/sync/one_click_signin_helper.h',
+            'browser/ui/sync/one_click_signin_histogram.h',
+            'browser/ui/sync/one_click_signin_sync_starter.cc',
+            'browser/ui/sync/one_click_signin_sync_starter.h',
+            'browser/ui/views/sync/one_click_signin_bubble_view.cc',
+            'browser/ui/views/sync/one_click_signin_bubble_view.h',
+          ]
+        }],
+        ['enable_task_manager==0', {
+          'sources/': [
+            ['exclude', '^browser/ui/webui/task_manager/'],
+            ['exclude', '^browser/ui/views/task_manager_view.cc'],
+            ['exclude', '^browser/ui/cocoa/task_manager_mac.h'],
+            ['exclude', '^browser/ui/cocoa/task_manager_mac.mm'],
+            ['exclude', '^browser/ui/gtk/task_manager_gtk.cc'],
+            ['exclude', '^browser/ui/gtk/task_manager_gtk.h'],
+          ],
+        }],
+        ['disable_nacl==0', {
+          'sources': [
+            'browser/ui/webui/nacl_ui.cc',
+            'browser/ui/webui/nacl_ui.h',
+          ],
+          'dependencies': [
+            '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
+          ],
+        }],
+        ['debug_devtools==1', {
+          'defines': [
+            'DEBUG_DEVTOOLS=1',
+          ],
+        }],
+        ['configuration_policy==1', {
+          'dependencies': [
+            'app/policy/cloud_policy_codegen.gyp:policy',
+          ],
+        }, {  # configuration_policy==0
+          'sources/': [
+            ['exclude', 'browser/ui/webui/policy_ui.cc'],
+            ['exclude', 'browser/ui/webui/policy_ui.h'],
+          ],
+        }],
+        ['enable_plugins==1', {
+          'dependencies': [
+            '../ppapi/ppapi_internal.gyp:ppapi_ipc',
+          ],
+        }, {  # enable_plugins == 0
+          'sources!': [
+            'browser/ui/hung_plugin_tab_helper.cc',
+            'browser/ui/hung_plugin_tab_helper.h',
+          ],
+        }],
+        ['safe_browsing==1', {
+          'defines': [
+            'FULL_SAFE_BROWSING',
+          ],
+        }, {  # safe_browsing==0 || safe_browsing==2
+          'dependencies!': [
+            'safe_browsing_proto',
+            'safe_browsing_report_proto',
+            '../third_party/libusb/libusb.gyp:libusb',
+          ],
+        }],
+        ['toolkit_views == 0', {
+          'sources!': [
+            'browser/ui/tabs/tab_strip_layout_type.h',
+            'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
+            'browser/ui/tabs/tab_strip_layout_type_prefs.h',
+          ],
+        }],
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:udev',
+          ],
+          'sources/': [
+            ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'],
+            ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'],
+          ],
+        }],
+        ['chromeos==0', {
+          'sources/': [
+            ['exclude', '^browser/ui/webui/chromeos'],
+            ['exclude', '^browser/ui/webui/options/chromeos'],
+          ],
+        }, {  # chromeos==1
+          'dependencies': [
+            'browser_chromeos',
+          ],
+          'sources/': [
+            ['exclude', 'browser/first_run/upgrade_util.cc'],
+            ['exclude', 'browser/first_run/upgrade_util.h'],
+            ['exclude', 'browser/first_run/upgrade_util_linux.cc'],
+            ['exclude', 'browser/icon_loader_linux.cc'],
+            ['exclude', 'browser/icon_manager_linux.cc'],
+            ['exclude', 'browser/idle_linux.cc'],
+            ['exclude', 'browser/password_manager/native_backend_gnome_x.cc'],
+            ['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
+            ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
+            ['exclude', 'browser/password_manager/native_backend_kwallet_x.h'],
+            ['exclude', 'browser/platform_util_linux.cc'],
+            ['exclude', 'browser/speech/extension_api/tts_extension_api_linux.cc'],
+            ['exclude', 'browser/storage_monitor/mtab_watcher_linux.cc'],
+            ['exclude', 'browser/storage_monitor/mtab_watcher_linux.h'],
+            ['exclude', 'browser/storage_monitor/storage_monitor_linux.cc'],
+            ['exclude', 'browser/storage_monitor/storage_monitor_linux.h'],
+            ['exclude', 'browser/ui/ash/caps_lock_delegate_views.cc'],
+            ['exclude', 'browser/ui/ash/chrome_shell_delegate_views.cc'],
+            ['exclude', 'browser/ui/ash/session_state_delegate_views.cc'],
+            ['exclude', 'browser/ui/screen_capture_notification_ui_stub.cc'],
+            ['exclude', 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc'],
+            ['exclude', 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h'],
+            ['exclude', 'browser/ui/views/frame/desktop_browser_frame_aura.cc'],
+            ['exclude', 'browser/ui/views/frame/desktop_browser_frame_aura.h'],
+            ['exclude', 'browser/ui/views/frame/desktop_user_action_handler_aura.cc'],
+            ['exclude', 'browser/ui/views/frame/desktop_user_action_handler_aura.h'],
+            ['exclude', 'browser/ui/views/frame/global_menu_bar_x11.cc'],
+            ['exclude', 'browser/ui/views/frame/global_menu_bar_x11.h'],
+            ['exclude', 'browser/ui/views/frame/global_menu_bar_registrar_x11.cc'],
+            ['exclude', 'browser/ui/views/frame/global_menu_bar_registrar_x11.h'],
+            ['exclude', 'browser/ui/views/screen_capture_notification_ui_views.cc'],
+            ['exclude', 'browser/ui/webui/help/version_updater_basic.cc'],
+            ['exclude', 'browser/ui/webui/help/version_updater_basic.h'],
+            ['exclude', 'browser/ui/webui/signin/user_manager_screen_handler.h'],
+            ['exclude', 'browser/ui/webui/signin/user_manager_screen_handler.cc'],
+            ['exclude', 'browser/ui/webui/signin/user_manager_ui.h'],
+            ['exclude', 'browser/ui/webui/signin/user_manager_ui.cc'],
+            ['exclude', 'browser/upgrade_detector_impl.cc'],
+            ['exclude', 'browser/upgrade_detector_impl.h'],
+          ],
+        }],
+        ['use_cups==1', {
+          'dependencies': [
+            '../printing/printing.gyp:cups',
+          ],
+        }],
+        ['use_gconf==0', {
+          'sources!': [
+            'browser/ui/gtk/gconf_titlebar_listener.cc',
+            'browser/ui/gtk/gconf_titlebar_listener.h',
+          ],
+        }],
+        ['use_ash==1', {
+          'sources': [
+            'browser/ui/views/touch_uma/touch_uma_ash.cc',
+          ],
+          'dependencies': [
+            '../ash/ash.gyp:ash',
+            '../ash/ash_strings.gyp:ash_strings',
+          ],
+        }, { # use_ash==0
+          'sources': [
+            'browser/ui/views/touch_uma/touch_uma.cc',
+          ],
+        }],
+        ['toolkit_views==0 or chromeos==1', {
+          'sources!': [
+            'browser/ui/views/message_center/message_center_frame_view.cc',
+            'browser/ui/views/message_center/message_center_frame_view.h',
+            'browser/ui/views/message_center/message_center_widget_delegate.h',
+            'browser/ui/views/message_center/message_center_widget_delegate.cc',
+            'browser/ui/views/message_center/web_notification_tray.h',
+            'browser/ui/views/message_center/web_notification_tray.cc',
+          ],
+        }],
+        ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', {
+          'dependencies': [
+            # gtk2 is the only component that can interact with gtk2 in our new
+            # world.
+            'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
+            '../ui/linux_ui/linux_ui.gyp:linux_ui',
+            '../build/linux/system.gyp:gio',
+          ],
+        }],
+        ['use_aura==0 or chromeos==1 or OS!="linux"', {
+          'sources!': [
+            'browser/ui/views/status_icons/status_icon_linux_wrapper.cc',
+            'browser/ui/views/status_icons/status_icon_linux_wrapper.h',
+          ],
+        }],
+        ['use_aura==1', {
+          'sources/': [
+            ['exclude', '^browser/ui/external_protocol_dialog_delegate.cc'],
+            ['exclude', '^browser/ui/panels/display_settings_provider_win.cc'],
+            ['exclude', '^browser/ui/panels/taskbar_window_thumbnailer_win.cc'],
+            ['exclude', '^browser/ui/panels/taskbar_window_thumbnailer_win.h'],
+            ['exclude', '^browser/ui/screen_capture_notification_ui_stub.cc'],
+            ['exclude', '^browser/ui/views/about_ipc_dialog.cc'],
+            ['exclude', '^browser/ui/views/app_menu_button_win.cc'],
+            ['exclude', '^browser/ui/views/dropdown_bar_host_win.cc'],
+            ['exclude', '^browser/ui/views/external_protocol_dialog.cc'],
+            ['exclude', '^browser/ui/views/find_bar_host_win.cc'],
+            ['exclude', '^browser/ui/views/frame/browser_frame_win.cc'],
+            ['exclude', '^browser/ui/views/frame/browser_frame_win.h'],
+            ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc'],
+            ['exclude', '^browser/ui/views/importer/import_progress_dialog_view.cc'],
+            ['exclude', '^browser/ui/views/omnibox/omnibox_view_win.cc'],
+            ['exclude', '^browser/ui/views/omnibox/omnibox_view_win.h'],
+            ['exclude', '^browser/ui/views/color_chooser_dialog.cc'],
+            ['exclude', '^browser/ui/views/color_chooser_dialog.h'],
+            ['exclude', '^browser/ui/views/color_chooser_win.cc'],
+            ['exclude', '^browser/ui/views/simple_message_box_win.cc'],
+            ['exclude', '^browser/ui/views/tabs/native_view_photobooth.h'],
+            ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.cc'],
+            ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.h'],
+            ['exclude', '^browser/ui/views/user_data_dir_dialog_view.cc'],
+            ['exclude', '^browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc'],
+            ['exclude', '^browser/ui/views/tab_contents/web_drag_bookmark_handler_win.h'],
+            ['exclude', '^browser/ui/webui/task_manager/'],
+            ['exclude', '^browser/ui/window_sizer/window_sizer_win.cc'],
+            # TODO: (stevenjb/beng): Find a home for these.
+            ['include', '^browser/ui/views/simple_message_box_views.cc'],
+            ['include', '^browser/ui/webui/certificate_viewer_webui.cc'],
+            ['include', '^browser/ui/webui/certificate_viewer_webui.h'],
+            ['include', '^browser/ui/webui/certificate_viewer_ui.cc'],
+            ['include', '^browser/ui/webui/certificate_viewer_ui.h'],
+          ],
+          'dependencies': [
+            # aura uses some of ash resources.
+            '../ash/ash.gyp:ash_resources',
+            '../ui/aura/aura.gyp:aura',
+            '../ui/keyboard/keyboard.gyp:keyboard',
+            '../ui/keyboard/keyboard.gyp:keyboard_resources',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'sources/': [
+                ['exclude', '^browser/ui/views/hwnd_util_win.cc'],
+                ['exclude', '^browser/ui/views/native_focus_tracker_views_win.cc'],
+                ['exclude', '^browser/ui/views/theme_image_mapper.cc'],
+                ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'],
+                ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'],
+                ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
+                ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
+                ['include', 'browser/ui/browser_win.cc'],
+              ],
+            }, {
+              'sources/': [
+                ['exclude', '^browser/ui/views/hwnd_util.h'],
+                ['exclude', '^browser/ui/views/frame/glass_browser_frame_view.cc'],
+                ['exclude', '^browser/ui/views/frame/glass_browser_frame_view.h'],
+              ],
+            }],
+          ],
+        }, { # else: use_aura==0
+          'sources/': [
+            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host.h'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_win.cc'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_win.h'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_x11.cc'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_x11.h'],
+            ['exclude', '^browser/ui/views/theme_image_mapper_aura_win.cc'],
+            ['exclude', '^browser/ui/webui/gesture_config_ui.cc'],
+            ['exclude', '^browser/ui/webui/gesture_config_ui.h'],
+            ['exclude', '^browser/ui/webui/salsa_ui.cc'],
+            ['exclude', '^browser/ui/webui/salsa_ui.h'],
+            ['exclude', '^browser/ui/webui/task_manager/'],
+          ],
+        }],
+        ['ui_compositor_image_transport==1', {
+          'dependencies': [
+            '../ui/gl/gl.gyp:gl',
+          ],
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+          'link_settings': {
+            'libraries': [
+              '-lXss',
+            ],
+          },
+        }],
+        ['use_nss!=1', {
+          'sources!': [
+            'browser/ui/webui/options/certificate_manager_handler.cc',
+            'browser/ui/webui/options/certificate_manager_handler.h',
+          ],
+        }],
+        ['use_nss==0 and use_openssl==0', {
+          'sources!': [
+            'browser/ui/webui/certificate_viewer_webui.cc',
+            'browser/ui/webui/certificate_viewer_webui.h',
+            'browser/ui/webui/certificate_viewer_ui.cc',
+            'browser/ui/webui/certificate_viewer_ui.h',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../build/linux/system.gyp:gconf',
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:gtkprint',
+            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:x11',
+            '../dbus/dbus.gyp:dbus',
+            '../third_party/undoview/undoview.gyp:undoview',
+          ],
+          'sources!': [
+            'browser/ui/screen_capture_notification_ui_stub.cc',
+          ],
+        }],
+        ['enable_themes==0', {
+          'sources!': [
+            'browser/ui/webui/theme_source.cc',
+          ],
+        }],
+        ['enable_printing!=1', {
+          'sources/': [
+            ['exclude', '^browser/ui/webui/print_preview/'],
+          ],
+        }],
+        ['OS=="android"', {
+          'dependencies': [
+            '../components/components.gyp:web_contents_delegate_android',
+            'chrome_browser_jni_headers',
+          ],
+          'sources': [
+            'browser/ui/webui/ntp/android/bookmarks_handler.cc',
+            'browser/ui/webui/ntp/android/bookmarks_handler.h',
+            'browser/ui/webui/ntp/android/context_menu_handler.cc',
+            'browser/ui/webui/ntp/android/context_menu_handler.h',
+            'browser/ui/webui/ntp/android/managed_bookmarks_shim.cc',
+            'browser/ui/webui/ntp/android/managed_bookmarks_shim.h',
+            'browser/ui/webui/ntp/android/navigation_handler.cc',
+            'browser/ui/webui/ntp/android/navigation_handler.h',
+            'browser/ui/webui/ntp/android/new_tab_page_ready_handler.cc',
+            'browser/ui/webui/ntp/android/new_tab_page_ready_handler.h',
+            'browser/ui/webui/ntp/android/partner_bookmarks_shim.cc',
+            'browser/ui/webui/ntp/android/partner_bookmarks_shim.h',
+            'browser/ui/webui/ntp/android/promo_handler.cc',
+            'browser/ui/webui/ntp/android/promo_handler.h',
+            'browser/ui/webui/ntp/android/ntp_resource_cache_android.cc',
+          ],
+          'sources!': [
+            # Android uses native UI for sync setup.
+            'browser/ui/webui/ntp/new_tab_page_sync_handler.cc',
+            'browser/ui/webui/ntp/new_tab_page_sync_handler.h',
+            'browser/ui/webui/ntp/ntp_login_handler.cc',
+            'browser/ui/webui/ntp/ntp_login_handler.h',
+            'browser/ui/webui/sync_setup_handler.cc',
+            'browser/ui/webui/sync_setup_handler.h',
+
+            # There's no Browser/BrowserList on Android.
+            'browser/ui/active_tab_tracker.cc',
+            'browser/ui/active_tab_tracker.h',
+            'browser/ui/blocked_content/popup_blocker_tab_helper.cc',
+            'browser/ui/blocked_content/popup_blocker_tab_helper.h',
+            'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc',
+            'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h',
+            'browser/ui/bookmarks/bookmark_context_menu_controller.cc',
+            'browser/ui/bookmarks/bookmark_prompt_controller.cc',
+            'browser/ui/browser.cc',
+            'browser/ui/browser_command_controller.cc',
+            'browser/ui/browser_finder.cc',
+            'browser/ui/browser_iterator.cc',
+            'browser/ui/browser_list.cc',
+            'browser/ui/browser_navigator.cc',
+            'browser/ui/browser_otr_state.cc',
+            'browser/ui/browser_tab_contents.cc',
+            'browser/ui/browser_tab_restore_service_delegate.cc',
+            'browser/ui/browser_tabstrip.cc',
+            'browser/ui/browser_tabstrip.h',
+            'browser/ui/chrome_pages.cc',
+            'browser/ui/chrome_pages.h',
+            'browser/ui/extensions/extension_install_ui_default.cc',
+            'browser/ui/extensions/extension_install_ui_default.h',
+            'browser/ui/ntp_background_util.cc',
+            'browser/ui/ntp_background_util.h',
+            'browser/ui/sad_tab_helper.cc',
+            'browser/ui/singleton_tabs.cc',
+            'browser/ui/singleton_tabs.h',
+            'browser/ui/sync/browser_synced_window_delegate.cc',
+            'browser/ui/tab_contents/tab_contents_iterator.cc',
+            'browser/ui/uma_browsing_activity_observer.cc',
+            'browser/ui/uma_browsing_activity_observer.h',
+            'browser/ui/webui/bookmarks_ui.cc',
+            'browser/ui/webui/bookmarks_ui.h',
+            'browser/ui/webui/certificate_viewer_webui.cc',
+            'browser/ui/webui/extensions/command_handler.cc',
+            'browser/ui/webui/extensions/extension_settings_handler.cc',
+            'browser/ui/webui/extensions/extension_settings_handler.h',
+            'browser/ui/webui/extensions/extensions_ui.cc',
+            'browser/ui/webui/extensions/install_extension_handler.cc',
+            'browser/ui/webui/identity_internals_ui.cc',
+            'browser/ui/webui/identity_internals_ui.h',
+            'browser/ui/webui/inspect_ui.cc',
+            'browser/ui/webui/inspect_ui.h',
+            'browser/ui/webui/ntp/app_launcher_handler.cc',
+            'browser/ui/webui/ntp/app_launcher_handler.h',
+            'browser/ui/webui/ntp/new_tab_page_handler.cc',
+            'browser/ui/webui/ntp/new_tab_page_handler.h',
+            'browser/ui/webui/ntp/ntp_resource_cache.cc',
+            'browser/ui/webui/ntp/suggestions_combiner.cc',
+            'browser/ui/webui/ntp/suggestions_combiner.h',
+            'browser/ui/webui/ntp/suggestions_page_handler.cc',
+            'browser/ui/webui/ntp/suggestions_page_handler.h',
+            'browser/ui/webui/ntp/suggestions_source.h',
+            'browser/ui/webui/ntp/suggestions_source_discovery.cc',
+            'browser/ui/webui/ntp/suggestions_source_discovery.h',
+            'browser/ui/webui/ntp/suggestions_source_top_sites.cc',
+            'browser/ui/webui/ntp/suggestions_source_top_sites.h',
+            'browser/ui/webui/plugins_ui.cc',
+            'browser/ui/webui/plugins_ui.h',
+            'browser/ui/webui/suggestions_internals/suggestions_internals_ui.cc',
+            'browser/ui/webui/suggestions_internals/suggestions_internals_ui.h',
+            'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.cc',
+            'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.h',
+            'browser/ui/window_sizer/window_sizer.cc',
+            'browser/ui/window_sizer/window_sizer.h',
+          ],
+          'sources/': [
+            ['exclude', '^browser/ui/autofill/.*credit_card_bubble.*'],
+            ['exclude', '^browser/ui/content_settings/'],
+            ['exclude', '^browser/ui/omnibox/'],
+            ['exclude', '^browser/ui/panels/'],
+            ['exclude', '^browser/ui/pdf/'],
+            ['exclude', '^browser/ui/startup/'],
+            ['exclude', '^browser/ui/tabs/'],
+            ['include', '^browser/ui/tabs/tab_utils\\.(cc|h)$'],
+            ['exclude', '^browser/ui/toolbar/'],
+            ['include', '^browser/ui/toolbar/toolbar_model\\.(cc|h)$'],
+            ['include', '^browser/ui/toolbar/toolbar_model_delegate\\.(cc|h)$'],
+            ['include', '^browser/ui/toolbar/toolbar_model_impl\\.(cc|h)$'],
+            ['include', '^browser/ui/toolbar/toolbar_model_security_level_list\\.h$'],
+            ['exclude', '^browser/ui/webui/downloads_'],
+            ['exclude', '^browser/ui/webui/feedback_'],
+            ['exclude', '^browser/ui/webui/help/'],
+            ['exclude', '^browser/ui/webui/inspect_'],
+            ['exclude', '^browser/ui/webui/options'],
+            ['exclude', '^browser/ui/webui/options'],
+            ['exclude', '^browser/ui/webui/signin/'],
+            ['exclude', '^browser/ui/webui/suggestions_internals'],
+            ['exclude', '^browser/ui/webui/sync_file_system_internals'],
+            ['exclude', '^browser/ui/webui/sync_promo'],
+            ['exclude', '^browser/ui/webui/uber'],
+          ],
+        }],
+        ['OS=="mac"', {
+          'sources!': [
+            'browser/ui/certificate_dialogs.cc',
+            'browser/ui/certificate_dialogs.h',
+            'browser/ui/crypto_module_password_dialog.cc',
+            'browser/ui/crypto_module_password_dialog_nss.cc',
+            'browser/ui/screen_capture_notification_ui_stub.cc',
+            'browser/ui/tabs/dock_info.cc',
+            'browser/ui/tabs/tab_resources.cc',
+            'browser/ui/views/extensions/extension_view_views.cc',
+            'browser/ui/views/extensions/extension_view_views.h',
+            'browser/ui/webui/help/version_updater_basic.cc',
+            'browser/ui/webui/help/version_updater_basic.h',
+          ],
+          'dependencies': [
+            '../ui/ui.gyp:ui_cocoa_third_party_toolkits',
+          ],
+          'include_dirs': [
+            '../third_party/GTM',
+          ],
+          'actions': [
+            {
+              # This action is used to extract the localization data from xib
+              # files and generate table for the ui localizer from it.
+              'variables': {
+                'xib_localizer_tool_path':
+                    'tools/build/mac/generate_localizer',
+              },
+              'includes': [
+                'chrome_nibs.gypi',
+              ],
+              'action_name': 'Process xibs for localization',
+              'inputs': [
+                '<(xib_localizer_tool_path)',
+                '<@(mac_translated_xibs)',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/ui_localizer_table.h',
+              ],
+              'action': ['<(xib_localizer_tool_path)',
+                          '<@(_outputs)',
+                          '<@(mac_translated_xibs)'],
+            },
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'dependencies': [
+            'installer_util_strings',
+            'launcher_support',
+            'metro_utils',
+            '../google_update/google_update.gyp:google_update',
+            '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+            '../third_party/isimpledom/isimpledom.gyp:isimpledom',
+            '../ui/app_list/app_list.gyp:app_list',
+            '../ui/views/controls/webview/webview.gyp:webview',
+            '../ui/views/views.gyp:views',
+            '../win8/win8.gyp:win8_util',
+          ],
+          'export_dependent_settings': [
+            '../ui/views/controls/webview/webview.gyp:webview',
+            '../ui/views/views.gyp:views',
+          ],
+          'sources': [
+            'browser/ui/views/network_profile_bubble_view.cc',
+            'browser/ui/views/network_profile_bubble_view.h',
+            'browser/ui/webui/conflicts_ui.cc',
+            'browser/ui/webui/conflicts_ui.h',
+          ],
+          'sources!': [
+            'browser/ui/certificate_dialogs.cc',
+            'browser/ui/certificate_dialogs.h',
+            'browser/ui/crypto_module_password_dialog.cc',
+            'browser/ui/crypto_module_password_dialog_nss.cc',
+            'browser/ui/screen_capture_notification_ui_stub.cc',
+            'browser/ui/startup/autolaunch_prompt.cc',
+            'browser/ui/views/frame/taskbar_decorator.cc',
+            'browser/ui/views/simple_message_box_views.cc',
+            'browser/ui/webui/help/version_updater_basic.cc',
+            'browser/ui/webui/help/version_updater_basic.h',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+        }, {  # 'OS!="win"
+          'sources/': [
+            # Exclude files that should be excluded for all non-Windows platforms.
+            ['exclude', '^browser/ui/network_profile_bubble.cc'],
+            ['exclude', '^browser/ui/network_profile_bubble.h'],
+            ['exclude', '^browser/ui/views/frame/system_menu_model.cc'],
+            ['exclude', '^browser/ui/views/frame/system_menu_model.h'],
+            ['exclude', '^browser/ui/webui/set_as_default_browser_ui.cc'],
+            ['exclude', '^browser/ui/webui/set_as_default_browser_ui.h'],
+          ],
+          'conditions': [
+            ['use_aura==1',{
+              'dependencies': [
+                '../build/linux/system.gyp:dbus',
+                '../build/linux/system.gyp:fontconfig',
+                '../build/linux/system.gyp:x11',
+                '../dbus/dbus.gyp:dbus',
+                '../ui/views/controls/webview/webview.gyp:webview',
+                '../ui/views/views.gyp:views',
+              ],
+              'include_dirs': [
+                '<(INTERMEDIATE_DIR)',
+                '<(INTERMEDIATE_DIR)/chrome',
+              ],
+              'sources/': [
+                ['exclude', '^browser/ui/views/frame/app_panel_browser_frame_view.cc'],
+                ['exclude', '^browser/ui/views/frame/app_panel_browser_frame_view.h'],
+                ['exclude', '^browser/ui/views/uninstall_view.cc'],
+                ['exclude', '^browser/ui/views/uninstall_view.h'],
+                ['include', '^browser/ui/tabs/dock_info.cc'],
+                ['include', '^browser/ui/tabs/dock_info.h'],
+                ['include', '^browser/ui/views/speech_recognition_bubble_views.cc'],
+                ['include', '^browser/ui/window_sizer/window_sizer.cc'],
+                ['include', '^browser/ui/window_sizer/window_sizer.h'],
+              ],
+            }, { # else: use_aura==0
+              'sources/': [
+                # Exclude all of views.
+                ['exclude', '^browser/ui/views/'],
+              ]
+            }],
+            # GTK build only
+            ['toolkit_uses_gtk==1', {
+              'sources/': [
+                ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'],
+                ['exclude', '^browser/ui/views/notifications/balloon_collection_views.cc'],
+              ],
+            }],
+          ],
+        }],
+        [ 'use_openssl==1', {
+          'sources!': [
+            'browser/ui/crypto_module_password_dialog_nss.cc',
+          ]}, {
+           'sources!': [
+             'browser/ui/crypto_module_password_dialog_openssl.cc',
+          ]},
+        ],
+        # File manager extension replaces the native OS file open/save dialog.
+        ['file_manager_extension==1', {
+          'sources/': [
+            ['include', '^browser/ui/views/select_file_dialog_extension.cc'],
+            ['include', '^browser/ui/views/select_file_dialog_extension.h'],
+            ['include', '^browser/ui/views/select_file_dialog_extension_factory.cc'],
+            ['include', '^browser/ui/views/select_file_dialog_extension_factory.h'],
+          ]}, {
+          'sources/': [
+            ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
+            ['exclude', '^browser/ui/views/select_file_dialog_extension.h'],
+            ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.cc'],
+            ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.h'],
+          ]}
+        ],
+        ['enable_app_list==1', {
+          'dependencies': [
+            '../ui/app_list/app_list.gyp:app_list',
+          ],
+          'sources!': [
+            'browser/ui/app_list/app_list_service_disabled.cc',
+          ],
+        }, { # else: enable_app_list==0
+          'sources/': [
+            ['exclude', '^browser/ui/views/app_list/'],
+            ['exclude', '^browser/ui/app_list/'],
+            ['include', '^browser/ui/app_list/app_list_service.h'],
+            ['include', '^browser/ui/app_list/app_list_service_disabled.cc'],
+          ],
+        }],
+        ['enable_autofill_dialog!=1 or OS=="android"', {
+          'sources!': [
+            'browser/ui/autofill/autofill_dialog_controller_impl.cc',
+            'browser/ui/autofill/autofill_dialog_controller_impl.h',
+            'browser/ui/autofill/autofill_dialog_view.h',
+            'browser/ui/autofill/autofill_dialog_view.cc',
+            'browser/ui/autofill/autofill_dialog_view_delegate.h',
+          ],
+        }],
+        ['enable_google_now==0', {
+          'sources!': [
+            'browser/ui/webui/options/geolocation_options_handler.cc',
+            'browser/ui/webui/options/geolocation_options_handler.h',
+          ],
+        }],
+        ['enable_webrtc==0', {
+          'sources!': [
+            'browser/ui/webui/media/webrtc_logs_ui.cc',
+            'browser/ui/webui/media/webrtc_logs_ui.h',
+          ],
+        }],
+        ['enable_mdns==1', {
+          'sources': [
+            'browser/ui/webui/local_discovery/local_discovery_ui.cc',
+            'browser/ui/webui/local_discovery/local_discovery_ui.h',
+            'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
+            'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/chrome_browser_ui_views.gyp b/chromium/chrome/chrome_browser_ui_views.gyp
new file mode 100644
index 00000000000..d10536bad89
--- /dev/null
+++ b/chromium/chrome/chrome_browser_ui_views.gyp
@@ -0,0 +1,42 @@
+# Copyright 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'browser_ui_views',
+      'type': '<(component)',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../ui/ui.gyp:ui',
+        '../url/url.gyp:url_lib',
+      ],
+      'conditions': [
+        ['use_ash==1', {
+          'dependencies': [
+            '../ash/ash.gyp:ash',
+          ],
+        }],
+      ],
+      'defines': [
+        'CHROME_VIEWS_IMPLEMENTATION',
+      ],
+      'sources': [
+        'browser/ui/views/accelerator_table.cc',
+        'browser/ui/views/accelerator_table.h',
+        'browser/ui/views/browser_dialogs.h',
+        'browser/ui/views/chrome_views_export.h',
+        'browser/ui/views/event_utils.cc',
+        'browser/ui/views/event_utils.h',
+        'browser/ui/views/tab_icon_view_model.h',
+        'browser/ui/views/tabs/tab_renderer_data.cc',
+        'browser/ui/views/tabs/tab_renderer_data.h',
+        'browser/ui/views/tabs/tab_strip_observer.cc',
+        'browser/ui/views/tabs/tab_strip_observer.h',
+        'browser/ui/views/tabs/tab_strip_types.h',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/chrome_common.gypi b/chromium/chrome/chrome_common.gypi
new file mode 100644
index 00000000000..ed7b021f152
--- /dev/null
+++ b/chromium/chrome/chrome_common.gypi
@@ -0,0 +1,855 @@
+# Copyright (c) 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'common',
+      'type': 'static_library',
+      'variables': {
+        'chrome_common_target': 1,
+        'enable_wexit_time_destructors': 1,
+      },
+      'include_dirs': [
+          '..',
+          '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_content_client.cc.
+        ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '..',
+        ],
+      },
+      'dependencies': [
+        # TODO(gregoryd): chrome_resources and chrome_strings could be
+        #  shared with the 64-bit target, but it does not work due to a gyp
+        # issue.
+        '../third_party/cld/cld.gyp:cld',
+        'common_net',
+        'common_version',
+        'installer_util',
+        'metrics_proto',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/base/base.gyp:base_prefs',
+        '<(DEPTH)/base/base.gyp:base_static',
+        '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
+        '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
+        '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
+        '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+        '<(DEPTH)/components/components.gyp:json_schema',
+        '<(DEPTH)/components/components.gyp:policy_component',
+        '<(DEPTH)/components/components.gyp:visitedlink_common',
+        '<(DEPTH)/content/content.gyp:content_common',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
+        '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
+        '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(DEPTH)/third_party/zlib/zlib.gyp:zip',
+        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/url/url.gyp:url_lib',
+        '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+      ],
+      'sources': [
+        '../apps/app_shim/app_shim_launch.h',
+        '../apps/app_shim/app_shim_messages.h',
+        '../extensions/common/crx_file.cc',
+        '../extensions/common/crx_file.h',
+        '../extensions/common/draggable_region.cc',
+        '../extensions/common/draggable_region.h',
+        '../extensions/common/error_utils.cc',
+        '../extensions/common/error_utils.h',
+        '../extensions/common/event_filter.cc',
+        '../extensions/common/event_filter.h',
+        '../extensions/common/event_filtering_info.cc',
+        '../extensions/common/event_filtering_info.h',
+        '../extensions/common/event_matcher.cc',
+        '../extensions/common/event_matcher.h',
+        '../extensions/common/extension_paths.cc',
+        '../extensions/common/extension_paths.h',
+        '../extensions/common/extension_resource.cc',
+        '../extensions/common/extension_resource.h',
+        '../extensions/common/extensions_client.cc',
+        '../extensions/common/extensions_client.h',
+        '../extensions/common/features/feature_provider.cc',
+        '../extensions/common/features/feature_provider.h',
+        '../extensions/common/id_util.cc',
+        '../extensions/common/id_util.h',
+        '../extensions/common/install_warning.cc',
+        '../extensions/common/install_warning.h',
+        '../extensions/common/manifest_constants.cc',
+        '../extensions/common/manifest_constants.h',
+        '../extensions/common/matcher/regex_set_matcher.cc',
+        '../extensions/common/matcher/regex_set_matcher.h',
+        '../extensions/common/matcher/string_pattern.cc',
+        '../extensions/common/matcher/string_pattern.h',
+        '../extensions/common/matcher/substring_set_matcher.cc',
+        '../extensions/common/matcher/substring_set_matcher.h',
+        '../extensions/common/matcher/url_matcher.cc',
+        '../extensions/common/matcher/url_matcher.h',
+        '../extensions/common/matcher/url_matcher_constants.cc',
+        '../extensions/common/matcher/url_matcher_constants.h',
+        '../extensions/common/matcher/url_matcher_factory.cc',
+        '../extensions/common/matcher/url_matcher_factory.h',
+        '../extensions/common/matcher/url_matcher_helpers.cc',
+        '../extensions/common/matcher/url_matcher_helpers.h',
+        '../extensions/common/one_shot_event.cc',
+        '../extensions/common/one_shot_event.h',
+        '../extensions/common/permissions/permissions_provider.h',
+        '../extensions/common/switches.cc',
+        '../extensions/common/switches.h',
+        '../extensions/common/url_pattern.cc',
+        '../extensions/common/url_pattern.h',
+        '../extensions/common/url_pattern_set.cc',
+        '../extensions/common/url_pattern_set.h',
+        '../extensions/common/user_script.cc',
+        '../extensions/common/user_script.h',
+        '../extensions/common/view_type.cc',
+        '../extensions/common/view_type.h',
+        'common/all_messages.h',
+        'common/attrition_experiments.h',
+        'common/auto_start_linux.cc',
+        'common/auto_start_linux.h',
+        'common/autocomplete_match_type.cc',
+        'common/autocomplete_match_type.h',
+        'common/automation_constants.cc',
+        'common/automation_constants.h',
+        'common/automation_id.cc',
+        'common/automation_id.h',
+        'common/automation_messages.cc',
+        'common/automation_messages.h',
+        'common/automation_messages_internal.h',
+        'common/badge_util.cc',
+        'common/badge_util.h',
+        'common/cancelable_task_tracker.cc',
+        'common/cancelable_task_tracker.h',
+        'common/child_process_logging.h',
+        'common/child_process_logging_mac.mm',
+        'common/child_process_logging_posix.cc',
+        'common/child_process_logging_win.cc',
+        'common/chrome_content_client.cc',
+        'common/chrome_content_client.h',
+        'common/chrome_content_client_constants.cc',
+        'common/chrome_content_client_ios.mm',
+        'common/chrome_result_codes.h',
+        'common/chrome_utility_messages.h',
+        'common/chrome_version_info.cc',
+        'common/chrome_version_info_android.cc',
+        'common/chrome_version_info_chromeos.cc',
+        'common/chrome_version_info_posix.cc',
+        'common/chrome_version_info_mac.mm',
+        'common/chrome_version_info_win.cc',
+        'common/chrome_version_info.h',
+        'common/cloud_print/cloud_print_class_mac.h',
+        'common/cloud_print/cloud_print_class_mac.mm',
+        'common/cloud_print/cloud_print_constants.cc',
+        'common/cloud_print/cloud_print_constants.h',
+        'common/cloud_print/cloud_print_helpers.cc',
+        'common/cloud_print/cloud_print_helpers.h',
+        'common/cloud_print/cloud_print_proxy_info.cc',
+        'common/cloud_print/cloud_print_proxy_info.h',
+        'common/common_message_generator.cc',
+        'common/common_message_generator.h',
+        'common/common_param_traits.cc',
+        'common/common_param_traits.h',
+        'common/common_param_traits_macros.h',
+        'common/content_restriction.h',
+        'common/content_settings.cc',
+        'common/content_settings.h',
+        'common/content_settings_helper.cc',
+        'common/content_settings_helper.h',
+        'common/content_settings_pattern.cc',
+        'common/content_settings_pattern.h',
+        'common/content_settings_pattern_parser.cc',
+        'common/content_settings_pattern_parser.h',
+        'common/content_settings_types.h',
+        'common/crash_keys.cc',
+        'common/crash_keys.h',
+        'common/custom_handlers/protocol_handler.cc',
+        'common/custom_handlers/protocol_handler.h',
+        'common/descriptors_android.h',
+        'common/dump_without_crashing.cc',
+        'common/dump_without_crashing.h',
+        'common/extensions/api/commands/commands_handler.cc',
+        'common/extensions/api/commands/commands_handler.h',
+        'common/extensions/api/extension_action/action_info.cc',
+        'common/extensions/api/extension_action/action_info.h',
+        'common/extensions/api/extension_action/browser_action_handler.cc',
+        'common/extensions/api/extension_action/browser_action_handler.h',
+        'common/extensions/api/extension_action/page_action_handler.cc',
+        'common/extensions/api/extension_action/page_action_handler.h',
+        'common/extensions/api/extension_action/script_badge_handler.cc',
+        'common/extensions/api/extension_action/script_badge_handler.h',
+        'common/extensions/api/extension_api.cc',
+        'common/extensions/api/extension_api.h',
+        'common/extensions/api/extension_api_stub.cc',
+        'common/extensions/api/file_browser_handlers/file_browser_handler.cc',
+        'common/extensions/api/file_browser_handlers/file_browser_handler.h',
+        'common/extensions/api/file_handlers/file_handlers_parser.cc',
+        'common/extensions/api/file_handlers/file_handlers_parser.h',
+        'common/extensions/api/i18n/default_locale_handler.cc',
+        'common/extensions/api/i18n/default_locale_handler.h',
+        'common/extensions/api/identity/oauth2_manifest_handler.cc',
+        'common/extensions/api/identity/oauth2_manifest_handler.h',
+        'common/extensions/api/input_ime/input_components_handler.cc',
+        'common/extensions/api/input_ime/input_components_handler.h',
+        'common/extensions/api/managed_mode_private/managed_mode_handler.cc',
+        'common/extensions/api/managed_mode_private/managed_mode_handler.h',
+        'common/extensions/api/media_galleries_private/media_galleries_handler.h',
+        'common/extensions/api/media_galleries_private/media_galleries_handler.cc',
+        'common/extensions/api/omnibox/omnibox_handler.cc',
+        'common/extensions/api/omnibox/omnibox_handler.h',
+        'common/extensions/api/plugins/plugins_handler.cc',
+        'common/extensions/api/plugins/plugins_handler.h',
+        'common/extensions/api/speech/tts_engine_manifest_handler.cc',
+        'common/extensions/api/speech/tts_engine_manifest_handler.h',
+        'common/extensions/api/spellcheck/spellcheck_handler.cc',
+        'common/extensions/api/spellcheck/spellcheck_handler.h',
+        'common/extensions/api/storage/storage_schema_manifest_handler.cc',
+        'common/extensions/api/storage/storage_schema_manifest_handler.h',
+        'common/extensions/api/system_indicator/system_indicator_handler.cc',
+        'common/extensions/api/system_indicator/system_indicator_handler.h',
+        'common/extensions/background_info.cc',
+        'common/extensions/background_info.h',
+        'common/extensions/chrome_extensions_client.cc',
+        'common/extensions/chrome_extensions_client.h',
+        'common/extensions/chrome_manifest_handlers.cc',
+        'common/extensions/chrome_manifest_handlers.h',
+        'common/extensions/command.cc',
+        'common/extensions/command.h',
+        'common/extensions/csp_handler.cc',
+        'common/extensions/csp_handler.h',
+        'common/extensions/csp_validator.cc',
+        'common/extensions/csp_validator.h',
+        'common/extensions/dom_action_types.h',
+        'common/extensions/extension.cc',
+        'common/extensions/extension.h',
+        'common/extensions/extension_constants.cc',
+        'common/extensions/extension_constants.h',
+        'common/extensions/extension_file_util.cc',
+        'common/extensions/extension_file_util.h',
+        'common/extensions/extension_icon_set.cc',
+        'common/extensions/extension_icon_set.h',
+        'common/extensions/extension_l10n_util.cc',
+        'common/extensions/extension_l10n_util.h',
+        'common/extensions/extension_manifest_constants.cc',
+        'common/extensions/extension_manifest_constants.h',
+        'common/extensions/extension_messages.cc',
+        'common/extensions/extension_messages.h',
+        'common/extensions/extension_process_policy.cc',
+        'common/extensions/extension_process_policy.h',
+        'common/extensions/extension_set.cc',
+        'common/extensions/extension_set.h',
+        'common/extensions/feature_switch.cc',
+        'common/extensions/feature_switch.h',
+        'common/extensions/features/api_feature.cc',
+        'common/extensions/features/api_feature.h',
+        'common/extensions/features/base_feature_provider.cc',
+        'common/extensions/features/base_feature_provider.h',
+        'common/extensions/features/complex_feature.cc',
+        'common/extensions/features/complex_feature.h',
+        'common/extensions/features/feature.cc',
+        'common/extensions/features/feature.h',
+        'common/extensions/features/feature_channel.cc',
+        'common/extensions/features/feature_channel.h',
+        'common/extensions/features/manifest_feature.cc',
+        'common/extensions/features/manifest_feature.h',
+        'common/extensions/features/permission_feature.cc',
+        'common/extensions/features/permission_feature.h',
+        'common/extensions/features/simple_feature.cc',
+        'common/extensions/features/simple_feature.h',
+        'common/extensions/incognito_handler.cc',
+        'common/extensions/incognito_handler.h',
+        'common/extensions/manifest.cc',
+        'common/extensions/manifest.h',
+        'common/extensions/manifest_handler.cc',
+        'common/extensions/manifest_handler.h',
+        'common/extensions/manifest_handler_helpers.cc',
+        'common/extensions/manifest_handler_helpers.h',
+        'common/extensions/manifest_handlers/app_isolation_info.cc',
+        'common/extensions/manifest_handlers/app_isolation_info.h',
+        'common/extensions/manifest_handlers/app_launch_info.cc',
+        'common/extensions/manifest_handlers/app_launch_info.h',
+        'common/extensions/manifest_handlers/content_scripts_handler.cc',
+        'common/extensions/manifest_handlers/content_scripts_handler.h',
+        'common/extensions/manifest_handlers/externally_connectable.cc',
+        'common/extensions/manifest_handlers/externally_connectable.h',
+        'common/extensions/manifest_handlers/icons_handler.cc',
+        'common/extensions/manifest_handlers/icons_handler.h',
+        'common/extensions/manifest_handlers/kiosk_enabled_info.cc',
+        'common/extensions/manifest_handlers/kiosk_enabled_info.h',
+        'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
+        'common/extensions/manifest_handlers/minimum_chrome_version_checker.h',
+        'common/extensions/manifest_handlers/nacl_modules_handler.cc',
+        'common/extensions/manifest_handlers/nacl_modules_handler.h',
+        'common/extensions/manifest_handlers/offline_enabled_info.cc',
+        'common/extensions/manifest_handlers/offline_enabled_info.h',
+        'common/extensions/manifest_handlers/requirements_handler.cc',
+        'common/extensions/manifest_handlers/requirements_handler.h',
+        'common/extensions/manifest_handlers/sandboxed_page_info.cc',
+        'common/extensions/manifest_handlers/sandboxed_page_info.h',
+        'common/extensions/manifest_handlers/shared_module_info.cc',
+        'common/extensions/manifest_handlers/shared_module_info.h',
+        'common/extensions/manifest_handlers/theme_handler.cc',
+        'common/extensions/manifest_handlers/theme_handler.h',
+        'common/extensions/manifest_url_handler.cc',
+        'common/extensions/manifest_url_handler.h',
+        'common/extensions/message_bundle.cc',
+        'common/extensions/message_bundle.h',
+        'common/extensions/mime_types_handler.cc',
+        'common/extensions/mime_types_handler.h',
+        'common/extensions/permissions/api_permission.cc',
+        'common/extensions/permissions/api_permission.h',
+        'common/extensions/permissions/api_permission_set.cc',
+        'common/extensions/permissions/api_permission_set.h',
+        'common/extensions/permissions/bluetooth_permission.cc',
+        'common/extensions/permissions/bluetooth_permission.h',
+        'common/extensions/permissions/bluetooth_permission_data.cc',
+        'common/extensions/permissions/bluetooth_permission_data.h',
+        'common/extensions/permissions/chrome_api_permissions.cc',
+        'common/extensions/permissions/chrome_api_permissions.h',
+        'common/extensions/permissions/chrome_scheme_hosts.cc',
+        'common/extensions/permissions/chrome_scheme_hosts.h',
+        'common/extensions/permissions/media_galleries_permission.cc',
+        'common/extensions/permissions/media_galleries_permission.h',
+        'common/extensions/permissions/media_galleries_permission_data.cc',
+        'common/extensions/permissions/media_galleries_permission_data.h',
+        'common/extensions/permissions/permission_message.cc',
+        'common/extensions/permissions/permission_message.h',
+        'common/extensions/permissions/permission_set.cc',
+        'common/extensions/permissions/permission_set.h',
+        'common/extensions/permissions/permissions_data.cc',
+        'common/extensions/permissions/permissions_data.h',
+        'common/extensions/permissions/permissions_info.cc',
+        'common/extensions/permissions/permissions_info.h',
+        'common/extensions/permissions/set_disjunction_permission.h',
+        'common/extensions/permissions/socket_permission.cc',
+        'common/extensions/permissions/socket_permission.h',
+        'common/extensions/permissions/socket_permission_data.cc',
+        'common/extensions/permissions/socket_permission_data.h',
+        'common/extensions/permissions/usb_device_permission.cc',
+        'common/extensions/permissions/usb_device_permission.h',
+        'common/extensions/permissions/usb_device_permission_data.cc',
+        'common/extensions/permissions/usb_device_permission_data.h',
+        'common/extensions/sync_helper.cc',
+        'common/extensions/sync_helper.h',
+        'common/extensions/update_manifest.cc',
+        'common/extensions/update_manifest.h',
+        'common/extensions/value_counter.cc',
+        'common/extensions/value_counter.h',
+        'common/extensions/web_accessible_resources_handler.cc',
+        'common/extensions/web_accessible_resources_handler.h',
+        'common/external_ipc_fuzzer.cc',
+        'common/external_ipc_fuzzer.h',
+        'common/favicon/favicon_types.cc',
+        'common/favicon/favicon_types.h',
+        'common/favicon/favicon_url_parser.cc',
+        'common/favicon/favicon_url_parser.h',
+        'common/icon_with_badge_image_source.cc',
+        'common/icon_with_badge_image_source.h',
+        'common/importer/firefox_importer_utils.cc',
+        'common/importer/firefox_importer_utils.h',
+        'common/importer/firefox_importer_utils_linux.cc',
+        'common/importer/firefox_importer_utils_mac.mm',
+        'common/importer/firefox_importer_utils_win.cc',
+        'common/importer/ie_importer_test_registry_overrider_win.cc',
+        'common/importer/ie_importer_test_registry_overrider_win.h',
+        'common/importer/ie_importer_utils_win.cc',
+        'common/importer/ie_importer_utils_win.h',
+        'common/importer/imported_bookmark_entry.cc',
+        'common/importer/imported_bookmark_entry.h',
+        'common/importer/imported_favicon_usage.cc',
+        'common/importer/imported_favicon_usage.h',
+        'common/importer/importer_bridge.cc',
+        'common/importer/importer_bridge.h',
+        'common/importer/importer_data_types.cc',
+        'common/importer/importer_data_types.h',
+        'common/importer/importer_type.h',
+        'common/importer/importer_url_row.cc',
+        'common/importer/importer_url_row.h',
+        'common/importer/profile_import_process_messages.cc',
+        'common/importer/profile_import_process_messages.h',
+        'common/importer/safari_importer_utils.h',
+        'common/importer/safari_importer_utils.mm',
+        'common/instant_restricted_id_cache.h',
+        'common/instant_types.cc',
+        'common/instant_types.h',
+        'common/localized_error.cc',
+        'common/localized_error.h',
+        'common/logging_chrome.cc',
+        'common/logging_chrome.h',
+        'common/mac/app_mode_common.h',
+        'common/mac/app_mode_common.mm',
+        'common/mac/cfbundle_blocker.h',
+        'common/mac/cfbundle_blocker.mm',
+        'common/mac/launchd.h',
+        'common/mac/launchd.mm',
+        'common/mac/nscoder_util.h',
+        'common/mac/nscoder_util.mm',
+        'common/mac/objc_method_swizzle.h',
+        'common/mac/objc_method_swizzle.mm',
+        'common/mac/objc_zombie.h',
+        'common/mac/objc_zombie.mm',
+        'common/media/webrtc_logging_messages.h',
+        'common/metrics/caching_permuted_entropy_provider.cc',
+        'common/metrics/caching_permuted_entropy_provider.h',
+        'common/metrics/entropy_provider.cc',
+        'common/metrics/entropy_provider.h',
+        'common/metrics/metrics_log_base.cc',
+        'common/metrics/metrics_log_base.h',
+        'common/metrics/metrics_log_manager.cc',
+        'common/metrics/metrics_log_manager.h',
+        'common/metrics/metrics_service_base.cc',
+        'common/metrics/metrics_service_base.h',
+        'common/metrics/metrics_util.cc',
+        'common/metrics/metrics_util.h',
+        'common/metrics/variations/uniformity_field_trials.cc',
+        'common/metrics/variations/uniformity_field_trials.h',
+        'common/metrics/variations/variations_associated_data.cc',
+        'common/metrics/variations/variations_associated_data.h',
+        'common/metrics/variations/variations_util.cc',
+        'common/metrics/variations/variations_util.h',
+        'common/multi_process_lock.h',
+        'common/multi_process_lock_linux.cc',
+        'common/multi_process_lock_mac.cc',
+        'common/multi_process_lock_win.cc',
+        'common/omaha_query_params/omaha_query_params.cc',
+        'common/omaha_query_params/omaha_query_params.h',
+        'common/omnibox_focus_state.h',
+        'common/one_click_signin_messages.h',
+        'common/partial_circular_buffer.cc',
+        'common/partial_circular_buffer.h',
+        'common/pepper_flash.cc',
+        'common/pepper_flash.h',
+        'common/pepper_permission_util.cc',
+        'common/pepper_permission_util.h',
+        'common/pref_names_util.cc',
+        'common/pref_names_util.h',
+        'common/print_messages.cc',
+        'common/print_messages.h',
+        'common/profiling.cc',
+        'common/profiling.h',
+        'common/ref_counted_util.h',
+        'common/render_messages.cc',
+        'common/render_messages.h',
+        'common/safe_browsing/download_protection_util.cc',
+        'common/safe_browsing/download_protection_util.h',
+        'common/safe_browsing/safebrowsing_messages.h',
+        'common/safe_browsing/zip_analyzer.cc',
+        'common/safe_browsing/zip_analyzer.h',
+        'common/search_provider.h',
+        'common/search_types.h',
+        'common/service_messages.h',
+        'common/service_process_util.cc',
+        'common/service_process_util.h',
+        'common/service_process_util_linux.cc',
+        'common/service_process_util_mac.mm',
+        'common/service_process_util_posix.cc',
+        'common/service_process_util_posix.h',
+        'common/service_process_util_win.cc',
+        'common/spellcheck_common.cc',
+        'common/spellcheck_common.h',
+        'common/spellcheck_marker.h',
+        'common/spellcheck_messages.h',
+        'common/spellcheck_result.h',
+        'common/startup_metric_utils.cc',
+        'common/startup_metric_utils.h',
+        'common/switch_utils.cc',
+        'common/switch_utils.h',
+        'common/thumbnail_score.cc',
+        'common/thumbnail_score.h',
+        'common/translate/language_detection_details.cc',
+        'common/translate/language_detection_details.h',
+        'common/translate/language_detection_util.cc',
+        'common/translate/language_detection_util.h',
+        'common/translate/translate_common_metrics.cc',
+        'common/translate/translate_common_metrics.h',
+        'common/translate/translate_errors.h',
+        'common/translate/translate_util.cc',
+        'common/translate/translate_util.h',
+        'common/tts_messages.h',
+        'common/tts_utterance_request.cc',
+        'common/tts_utterance_request.h',
+        'common/url_constants.cc',
+        'common/url_constants.h',
+        'common/validation_message_messages.h',
+        'common/web_application_info.cc',
+        'common/web_application_info.h',
+        'common/worker_thread_ticker.cc',
+        'common/worker_thread_ticker.h',
+        '../components/nacl/common/nacl_host_messages.h',
+        '../components/nacl/common/nacl_process_type.h',
+        '../components/nacl/common/nacl_sandbox_type_mac.h',
+        '../components/nacl/common/pnacl_types.cc',
+        '../components/nacl/common/pnacl_types.h',
+      ],
+      'conditions': [
+        ['enable_extensions==1', {
+          'sources!': [
+            'common/extensions/api/extension_api_stub.cc',
+          ],
+          'dependencies': [
+            '../device/bluetooth/bluetooth.gyp:device_bluetooth',
+            '../device/usb/usb.gyp:device_usb',
+          ],
+        }, {  # enable_extensions == 0
+          'sources/': [
+            ['exclude', '^common/extensions/api/'],
+            ['include', 'common/extensions/api/extension_api_stub.cc'],
+            ['include', 'common/extensions/api/extension_action/action_info.cc'],
+            ['include', 'common/extensions/api/extension_action/action_info.h'],
+            ['include', 'common/extensions/api/extension_action/browser_action_handler.cc'],
+            ['include', 'common/extensions/api/extension_action/browser_action_handler.h'],
+            ['include', 'common/extensions/api/extension_action/page_action_handler.cc'],
+            ['include', 'common/extensions/api/extension_action/page_action_handler.h'],
+            ['include', 'common/extensions/api/i18n/default_locale_handler.cc'],
+            ['include', 'common/extensions/api/i18n/default_locale_handler.h'],
+            ['include', 'common/extensions/api/identity/oauth2_manifest_handler.cc'],
+            ['include', 'common/extensions/api/identity/oauth2_manifest_handler.h'],
+            ['include', 'common/extensions/api/managed_mode_private/managed_mode_handler.cc'],
+            ['include', 'common/extensions/api/managed_mode_private/managed_mode_handler.h'],
+            ['include', 'common/extensions/api/plugins/plugins_handler.cc'],
+            ['include', 'common/extensions/api/plugins/plugins_handler.h'],
+            ['include', 'common/extensions/api/spellcheck/spellcheck_handler.cc'],
+            ['include', 'common/extensions/api/spellcheck/spellcheck_handler.h'],
+            ['include', 'common/extensions/api/storage/storage_schema_manifest_handler.cc'],
+            ['include', 'common/extensions/api/storage/storage_schema_manifest_handler.h'],
+          ],
+        }],
+        ['OS=="win" or OS=="mac"', {
+          'sources': [
+            'common/media_galleries/itunes_library.cc',
+            'common/media_galleries/itunes_library.h',
+            'common/media_galleries/itunes_xml_utils.cc',
+            'common/media_galleries/itunes_xml_utils.h',
+            'common/media_galleries/picasa_types.cc',
+            'common/media_galleries/picasa_types.h',
+            'common/media_galleries/pmp_constants.h',
+          ],
+        }],
+        ['OS != "ios"', {
+          'dependencies': [
+            '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',
+            '<(DEPTH)/chrome/common/extensions/api/api.gyp:api',
+            '<(DEPTH)/components/components.gyp:autofill_core_common',
+            '<(DEPTH)/components/nacl_common.gyp:nacl_common',
+            '<(DEPTH)/ipc/ipc.gyp:ipc',
+            '<(DEPTH)/printing/printing.gyp:printing',
+            '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
+            '<(DEPTH)/third_party/re2/re2.gyp:re2',
+            '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+          ],
+        }, {  # OS == ios
+          'sources/': [
+            ['exclude', '^common/child_process_'],
+            ['exclude', '^common/chrome_content_client\\.cc$'],
+            ['exclude', '^common/chrome_version_info_posix\\.cc$'],
+            ['exclude', '^common/common_message_generator\\.cc$'],
+            ['exclude', '^common/common_param_traits'],
+            ['exclude', '^common/custom_handlers/'],
+            ['exclude', '^common/extensions/'],
+            ['exclude', '^common/external_ipc_fuzzer\\.'],
+            ['exclude', '^common/logging_chrome\\.'],
+            ['exclude', '^common/multi_process_'],
+            ['exclude', '^common/nacl_'],
+            ['exclude', '^common/pepper_flash\\.'],
+            ['exclude', '^common/profiling\\.'],
+            ['exclude', '^common/service_process_util_'],
+            ['exclude', '^common/spellcheck_'],
+            ['exclude', '^common/validation_message_'],
+            ['exclude', '^common/web_apps\\.'],
+            # TODO(ios): Include files here as they are made to work; once
+            # everything is online, remove everything below here and just
+            # use the exclusions above.
+            ['exclude', '\\.(cc|mm)$'],
+            ['include', '_ios\\.(cc|mm)$'],
+            ['include', '(^|/)ios/'],
+            ['include', '^common/chrome_version_info\\.cc$'],
+            ['include', '^common/translate'],
+            ['include', '^common/zip'],
+          ],
+          'include_dirs': [
+            '<(DEPTH)/breakpad/src',
+          ],
+        }],
+        ['OS!="ios" and chrome_multiple_dll!=1', {
+          'dependencies': [
+            '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+          ],
+        }],
+        ['OS=="android"', {
+          'sources/': [
+            ['exclude', '^common/chrome_version_info_posix.cc'],
+            ['exclude', '^common/service_'],
+          ],
+          'dependencies!': [
+            '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '<(DEPTH)/breakpad/src',
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+        }],
+        ['enable_mdns == 1', {
+            'sources': [
+              'common/local_discovery/local_discovery_messages.h',
+              'common/local_discovery/service_discovery_client.cc',
+              'common/local_discovery/service_discovery_client.h',
+            ]
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+          'export_dependent_settings': [
+            '../third_party/sqlite/sqlite.gyp:sqlite',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lX11',
+              '-lXrender',
+              '-lXss',
+              '-lXext',
+            ],
+          },
+        }],
+        ['chromeos==1', {
+          'sources!': [
+            'common/chrome_version_info_linux.cc',
+          ],
+        }],
+        ['OS=="mac"', {
+          'dependencies': [
+            '../third_party/mach_override/mach_override.gyp:mach_override',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/breakpad/src',
+            '../third_party/GTM',
+          ],
+          'sources!': [
+            'common/child_process_logging_posix.cc',
+            'common/chrome_version_info_posix.cc',
+          ],
+        }],
+        ['remoting==1', {
+          'dependencies': [
+            '../remoting/remoting.gyp:remoting_client_plugin',
+          ],
+        }],
+        ['enable_automation==0', {
+          'sources/': [
+            ['exclude', '^common/automation_']
+          ]
+        }],
+        ['use_system_nspr==1', {
+          'dependencies': [
+            '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr',
+          ],
+        }],
+        ['enable_webrtc==0', {
+          'sources!': [
+            'common/media/webrtc_logging_messages.h',
+          ]
+        }],
+        ['enable_printing==0', {
+          'sources!': [
+            'common/print_messages.cc',
+            'common/print_messages.h',
+          ]
+        }],
+      ],
+      'target_conditions': [
+        ['OS == "ios"', {
+          'sources/': [
+            # Pull in specific Mac files for iOS (which have been filtered out
+            # by file name rules).
+            ['include', '^common/chrome_version_info_mac\\.mm$'],
+            ['include', '^common/mac/nscoder_util\\.'],
+          ],
+        }],
+      ],
+      'export_dependent_settings': [
+        '../base/base.gyp:base',
+        'metrics_proto',
+      ],
+    },
+    {
+      'target_name': 'common_version',
+      'type': 'none',
+      'conditions': [
+        ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)',
+            ],
+          },
+          # Because posix_version generates a header, we must set the
+          # hard_dependency flag.
+          'hard_dependency': 1,
+          'actions': [
+            {
+              'action_name': 'posix_version',
+              'variables': {
+                'lastchange_path':
+                  '<(DEPTH)/build/util/LASTCHANGE',
+                'version_py_path': 'tools/build/version.py',
+                'version_path': 'VERSION',
+                'template_input_path': 'common/chrome_version_info_posix.h.version',
+              },
+              'conditions': [
+                [ 'branding == "Chrome"', {
+                  'variables': {
+                     'branding_path':
+                       'app/theme/google_chrome/BRANDING',
+                  },
+                }, { # else branding!="Chrome"
+                  'variables': {
+                     'branding_path':
+                       'app/theme/chromium/BRANDING',
+                  },
+                }],
+              ],
+              'inputs': [
+                '<(template_input_path)',
+                '<(version_path)',
+                '<(branding_path)',
+                '<(lastchange_path)',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/common/chrome_version_info_posix.h',
+              ],
+              'action': [
+                'python',
+                '<(version_py_path)',
+                '-f', '<(version_path)',
+                '-f', '<(branding_path)',
+                '-f', '<(lastchange_path)',
+                '<(template_input_path)',
+                '<@(_outputs)',
+              ],
+              'message': 'Generating version information',
+            },
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'common_net',
+      'type': 'static_library',
+      'sources': [
+        'common/net/net_error_info.cc',
+        'common/net/net_error_info.h',
+        'common/net/net_resource_provider.cc',
+        'common/net/net_resource_provider.h',
+        'common/net/predictor_common.h',
+        'common/net/url_fixer_upper.cc',
+        'common/net/url_fixer_upper.h',
+        'common/net/url_util.cc',
+        'common/net/url_util.h',
+        'common/net/x509_certificate_model.cc',
+        'common/net/x509_certificate_model_nss.cc',
+        'common/net/x509_certificate_model_openssl.cc',
+        'common/net/x509_certificate_model.h',
+      ],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
+        '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
+        '<(DEPTH)/crypto/crypto.gyp:crypto',
+        '<(DEPTH)/net/net.gyp:net_resources',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+      ],
+      'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            '<(DEPTH)/gpu/gpu.gyp:gpu_ipc',
+          ],
+        }, {  # OS == ios
+          'sources!': [
+            'common/net/net_resource_provider.cc',
+            'common/net/x509_certificate_model.cc',
+          ],
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+            'dependencies': [
+              '../build/linux/system.gyp:ssl',
+            ],
+          },
+        ],
+        ['os_posix != 1 or OS == "mac" or OS == "ios"', {
+            'sources!': [
+              'common/net/x509_certificate_model_nss.cc',
+              'common/net/x509_certificate_model_openssl.cc',
+            ],
+          },
+        ],
+        ['OS == "android"', {
+            'dependencies': [
+              '../third_party/openssl/openssl.gyp:openssl',
+            ],
+          },
+        ],
+        ['use_openssl==1', {
+            'sources!': [
+              'common/net/x509_certificate_model_nss.cc',
+            ],
+          },
+          {  # else !use_openssl: remove the unneeded files
+            'sources!': [
+              'common/net/x509_certificate_model_openssl.cc',
+            ],
+          },
+        ],
+        ['OS=="win"', {
+            # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+            'msvs_disabled_warnings': [4267, ],
+          },
+        ],
+      ],
+    },
+    {
+      # Protobuf compiler / generator for the safebrowsing client
+      # model proto and the client-side detection (csd) request
+      # protocol buffer.
+      'target_name': 'safe_browsing_proto',
+      'type': 'static_library',
+      'sources': [
+        'common/safe_browsing/client_model.proto',
+        'common/safe_browsing/csd.proto'
+      ],
+      'variables': {
+        'proto_in_dir': 'common/safe_browsing',
+        'proto_out_dir': 'chrome/common/safe_browsing',
+      },
+      'includes': [ '../build/protoc.gypi' ],
+    },
+    {
+      # Protobuf compiler / generator for UMA (User Metrics Analysis).
+      'target_name': 'metrics_proto',
+      'type': 'static_library',
+      'sources': [
+        'common/metrics/proto/chrome_experiments.proto',
+        'common/metrics/proto/chrome_user_metrics_extension.proto',
+        'common/metrics/proto/histogram_event.proto',
+        'common/metrics/proto/omnibox_event.proto',
+        'common/metrics/proto/perf_data.proto',
+        'common/metrics/proto/permuted_entropy_cache.proto',
+        'common/metrics/proto/profiler_event.proto',
+        'common/metrics/proto/system_profile.proto',
+        'common/metrics/proto/user_action_event.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'common/metrics/proto',
+        'proto_out_dir': 'chrome/common/metrics/proto',
+      },
+      'includes': [ '../build/protoc.gypi' ],
+    },
+  ],
+}
diff --git a/chromium/chrome/chrome_dll.gypi b/chromium/chrome/chrome_dll.gypi
new file mode 100644
index 00000000000..a64ad95e6b7
--- /dev/null
+++ b/chromium/chrome/chrome_dll.gypi
@@ -0,0 +1,381 @@
+# Copyright (c) 2012 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': [
+    ['OS=="mac" or OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'chrome_dll',
+          'type': 'none',
+          'dependencies': [
+            'chrome_main_dll',
+          ],
+          'conditions': [
+            ['OS=="mac" and component=="shared_library"', {
+              'type': 'shared_library',
+              'includes': [ 'chrome_dll_bundle.gypi' ],
+              'xcode_settings': {
+                'OTHER_LDFLAGS': [
+                  '-Wl,-reexport_library,<(PRODUCT_DIR)/libchrome_main_dll.dylib',
+                ],
+              },
+            }],  # OS=="mac"
+            ['chrome_multiple_dll==1', {
+              'dependencies': [
+                'chrome_child_dll',
+              ],
+            }],
+            ['incremental_chrome_dll==1', {
+              # Linking to a different directory and then hardlinking back
+              # to OutDir is a workaround to avoid having the .ilk for
+              # chrome.exe and chrome.dll conflicting. See crbug.com/92528
+              # for more information. Done on the dll instead of the exe so
+              # that people launching from VS don't need to modify
+              # $(TargetPath) for the exe.
+              'actions': [
+                {
+                  'action_name': 'hardlink_to_output',
+                  'inputs': [
+                    '$(OutDir)\\initial\\chrome.dll',
+                  ],
+                  'outputs': [
+                    '$(OutDir)\\chrome.dll',
+                  ],
+                  'action': ['tools\\build\\win\\hardlink_failsafe.bat',
+                             '$(OutDir)\\initial\\chrome.dll',
+                             '$(OutDir)\\chrome.dll'],
+                  'msvs_cygwin_shell': 0,
+                },
+              ],
+              'conditions': [
+                # Only hardlink pdb if we're generating debug info.
+                ['fastbuild==0 or win_z7!=0', {
+                  'actions': [
+                    {
+                      'action_name': 'hardlink_pdb_to_output',
+                      'inputs': [
+                        # Not the pdb, since gyp doesn't know about it
+                        '$(OutDir)\\initial\\chrome.dll',
+                      ],
+                      'outputs': [
+                        '$(OutDir)\\chrome.dll.pdb',
+                      ],
+                      'action': ['tools\\build\\win\\hardlink_failsafe.bat',
+                                 '$(OutDir)\\initial\\chrome.dll.pdb',
+                                 '$(OutDir)\\chrome.dll.pdb'],
+                      'msvs_cygwin_shell': 0,
+                    }
+                  ]
+                }]
+              ],
+            }],
+          ]
+        },
+        {
+          'target_name': 'chrome_main_dll',
+          'type': 'shared_library',
+          'variables': {
+            'enable_wexit_time_destructors': 1,
+          },
+          'dependencies': [
+            '<@(chromium_browser_dependencies)',
+            '../content/content.gyp:content_app_browser',
+            'app/policy/cloud_policy_codegen.gyp:policy',
+          ],
+          'conditions': [
+            ['use_aura==1', {
+              'dependencies': [
+                '../ui/compositor/compositor.gyp:compositor',
+              ],
+            }],
+            ['OS=="win" and target_arch=="ia32"', {
+              # Add a dependency to custom import library for user32 delay
+              # imports only in x86 builds.
+              'dependencies': [
+                'chrome_user32_delay_imports',
+              ],
+            },],
+            ['OS=="win"', {
+              'product_name': 'chrome',
+              'dependencies': [
+                # On Windows, link the dependencies (libraries) that make
+                # up actual Chromium functionality into this .dll.
+                'chrome_dll_pdb_workaround',
+                'chrome_resources.gyp:chrome_resources',
+                'chrome_version_resources',
+                '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
+                '../crypto/crypto.gyp:crypto',
+                '../printing/printing.gyp:printing',
+                '../net/net.gyp:net_resources',
+                '../third_party/cld/cld.gyp:cld',
+                '../ui/views/views.gyp:views',
+                '../webkit/webkit_resources.gyp:webkit_resources',
+              ],
+              'sources': [
+                'app/chrome_command_ids.h',
+                'app/chrome_dll.rc',
+                'app/chrome_dll_resource.h',
+                'app/chrome_main.cc',
+                'app/chrome_main_delegate.cc',
+                'app/chrome_main_delegate.h',
+                'app/delay_load_hook_win.cc',
+                'app/delay_load_hook_win.h',
+
+                '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
+                '../base/win/dllmain.cc',
+
+                '../ui/resources/cursors/aliasb.cur',
+                '../ui/resources/cursors/cell.cur',
+                '../ui/resources/cursors/col_resize.cur',
+                '../ui/resources/cursors/copy.cur',
+                '../ui/resources/cursors/none.cur',
+                '../ui/resources/cursors/row_resize.cur',
+                '../ui/resources/cursors/vertical_text.cur',
+                '../ui/resources/cursors/zoom_in.cur',
+                '../ui/resources/cursors/zoom_out.cur',
+
+                # TODO:  It would be nice to have these pulled in
+                # automatically from direct_dependent_settings in
+                # their various targets (net.gyp:net_resources, etc.),
+                # but that causes errors in other targets when
+                # resulting .res files get referenced multiple times.
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
+              ],
+              'include_dirs': [
+                '<(DEPTH)/third_party/wtl/include',
+              ],
+              'configurations': {
+                'Debug_Base': {
+                  'msvs_settings': {
+                    'VCLinkerTool': {
+                      'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                    },
+                  },
+                },
+              },
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'BaseAddress': '0x01c30000',
+                  'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
+                  # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
+                  'SubSystem': '2',
+                  'conditions': [
+                    ['incremental_chrome_dll==1', {
+                      'OutputFile': '$(OutDir)\\initial\\chrome.dll',
+                      'UseLibraryDependencyInputs': "true",
+                    }],
+                    ['target_arch=="ia32"', {
+                      # Link against the XP-constrained user32 import library
+                      # instead of the platform-SDK provided one to avoid
+                      # inadvertently taking dependencies on post-XP user32
+                      # exports.
+                      'AdditionalDependencies!': [
+                        'user32.lib',
+                      ],
+                      'IgnoreDefaultLibraryNames': [
+                        'user32.lib',
+                      ],
+                      # Remove user32 delay load for chrome.dll.
+                      'DelayLoadDLLs!': [
+                        'user32.dll',
+                      ],
+                      'AdditionalDependencies': [
+                        'user32.winxp.lib',
+                      ],
+                      'DelayLoadDLLs': [
+                        'user32-delay.dll',
+                      ],
+                      'AdditionalLibraryDirectories': [
+                        '<(DEPTH)/build/win/importlibs/x86',
+                      ],
+                      'ForceSymbolReferences': [
+                        # Force the inclusion of the delay load hook in this
+                        # binary.
+                        '_ChromeDelayLoadHook@8',
+                      ],
+                    }],
+                  ],
+                  'DelayLoadDLLs': [
+                    'comdlg32.dll',
+                    'crypt32.dll',
+                    'cryptui.dll',
+                    'dhcpcsvc.dll',
+                    'imagehlp.dll',
+                    'imm32.dll',
+                    'iphlpapi.dll',
+                    'setupapi.dll',
+                    'urlmon.dll',
+                    'winhttp.dll',
+                    'wininet.dll',
+                    'winspool.drv',
+                    'ws2_32.dll',
+                    'wsock32.dll',
+                  ],
+                },
+                'VCManifestTool': {
+                  'AdditionalManifestFiles': [
+                    '$(ProjectDir)\\app\\chrome.dll.manifest',
+                  ],
+                },
+              },
+              'conditions': [
+                ['win_use_allocator_shim==1', {
+                  'dependencies': [
+                    '<(allocator_target)',
+                  ],
+                }],
+              ]
+            }],
+            ['chrome_multiple_dll==1', {
+              'defines': [
+                'CHROME_MULTIPLE_DLL_BROWSER',
+              ],
+            }, {
+              'dependencies': [
+                '<@(chromium_child_dependencies)',
+                '../content/content.gyp:content_app_both',
+                '../content/content.gyp:content_worker',
+              ],
+              'dependencies!': [
+                '../content/content.gyp:content_app_browser',
+              ],
+            }],
+            ['OS=="mac" and component!="shared_library"', {
+              'includes': [ 'chrome_dll_bundle.gypi' ],
+            }],
+            ['OS=="mac" and component=="shared_library"', {
+              'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], },
+            }],
+            ['OS=="mac"', {
+              'xcode_settings': {
+                # Define the order of symbols within the framework.  This
+                # sets -order_file.
+                'ORDER_FILE': 'app/framework.order',
+              },
+              'sources': [
+                'app/chrome_command_ids.h',
+                'app/chrome_dll_resource.h',
+                'app/chrome_main.cc',
+                'app/chrome_main_delegate.cc',
+                'app/chrome_main_delegate.h',
+                'app/chrome_main_mac.mm',
+                'app/chrome_main_mac.h',
+              ],
+              'include_dirs': [
+                '<(grit_out_dir)',
+              ],
+              'postbuilds': [
+                {
+                  # This step causes an error to be raised if the .order file
+                  # does not account for all global text symbols.  It
+                  # validates the completeness of the .order file.
+                  'postbuild_name': 'Verify global text symbol order',
+                  'variables': {
+                    'verify_order_path': 'tools/build/mac/verify_order',
+                  },
+                  'action': [
+                    '<(verify_order_path)',
+                    '_ChromeMain',
+                    '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}',
+                  ],
+                },
+              ],
+              'conditions': [
+                ['mac_breakpad_compiled_in==1', {
+                  'dependencies': [
+                    '../breakpad/breakpad.gyp:breakpad',
+                    '../components/components.gyp:breakpad_component',
+                    'app/policy/cloud_policy_codegen.gyp:policy',
+                  ],
+                  'sources': [
+                    'app/breakpad_mac.mm',
+                    'app/breakpad_mac.h',
+                    'app/chrome_breakpad_client.cc',
+                    'app/chrome_breakpad_client.h',
+                    'app/chrome_breakpad_client_mac.mm',
+                  ],
+                }, {  # else: mac_breakpad_compiled_in!=1
+                  # No Breakpad, put in the stubs.
+                  'dependencies': [
+                    '../components/components.gyp:breakpad_stubs',
+                  ],
+                  'sources': [
+                    'app/breakpad_mac_stubs.mm',
+                    'app/breakpad_mac.h',
+                  ],
+                }],  # mac_breakpad_compiled_in
+                ['internal_pdf', {
+                  'dependencies': [
+                    '../pdf/pdf.gyp:pdf',
+                  ],
+                }],
+              ],  # conditions
+            }],  # OS=="mac"
+          ],  # conditions
+        },  # target chrome_main_dll
+      ],  # targets
+    }],  # OS=="mac" or OS=="win"
+    ['OS=="win"', {
+      'targets': [
+        {
+          # This target is only depended upon on Windows.
+          'target_name': 'chrome_dll_pdb_workaround',
+          'type': 'static_library',
+          'sources': [ 'empty_pdb_workaround.cc' ],
+          'conditions': [
+            ['fastbuild==0 or win_z7!=0', {
+             'msvs_settings': {
+              'VCCLCompilerTool': {
+                # This *in the compile phase* must match the pdb name that's
+                # output by the final link. See empty_pdb_workaround.cc for
+                # more details.
+                'DebugInformationFormat': '3',
+                'ProgramDataBaseFileName': '<(PRODUCT_DIR)/chrome.dll.pdb',
+              },
+             },
+            }],
+          ],
+        },
+      ],
+    }],
+    ['chrome_multiple_dll', {
+      'targets': [
+        {
+          'target_name': 'chrome_child_dll',
+          'type': 'shared_library',
+          'product_name': 'chrome_child',
+          'variables': {
+            'enable_wexit_time_destructors': 1,
+          },
+          'dependencies': [
+            '<@(chromium_child_dependencies)',
+            '../content/content.gyp:content_app_child',
+            '../content/content.gyp:content_worker',
+            'chrome_version_resources',
+            'policy_path_parser',
+          ],
+          'defines': [
+            'CHROME_MULTIPLE_DLL_CHILD',
+          ],
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
+            'app/chrome_main.cc',
+            'app/chrome_main_delegate.cc',
+            'app/chrome_main_delegate.h',
+          ],
+        },  # target chrome_child_dll
+      ],
+    }],
+  ],
+}
diff --git a/chromium/chrome/chrome_dll_bundle.gypi b/chromium/chrome/chrome_dll_bundle.gypi
new file mode 100644
index 00000000000..9b8d1af5ea2
--- /dev/null
+++ b/chromium/chrome/chrome_dll_bundle.gypi
@@ -0,0 +1,313 @@
+# Copyright (c) 2012 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.
+
+# This file contains resources for the main Mac chromium bundle.
+{
+  # The main browser executable's name is <(mac_product_name).
+  # Certain things will get confused if two modules in the
+  # executable share the same name, so append " Framework" to the
+  # product_name used for the framework.  This will result in
+  # a name like "Chromium Framework.framework".
+  'product_name': '<(mac_product_name) Framework',
+  'mac_bundle': 1,
+  'xcode_settings': {
+    'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
+
+    # The dylib versions are of the form a[.b[.c]], where a is a
+    # 16-bit unsigned integer, and b and c are 8-bit unsigned
+    # integers.  Any missing component is taken to be 0.  The
+    # best mapping from product version numbers into this scheme
+    # is to just use a=BUILD, b=(PATCH/256), c=(PATCH%256). There
+    # is no ambiguity in this scheme because the build and patch
+    # numbers are guaranteed unique even across distinct major
+    # and minor version numbers.  These settings correspond to
+    # -compatibility_version and -current_version.
+    'DYLIB_COMPATIBILITY_VERSION': '<(version_mac_dylib)',
+    'DYLIB_CURRENT_VERSION': '<(version_mac_dylib)',
+
+    # The framework is placed within the .app's versioned
+    # directory.  DYLIB_INSTALL_NAME_BASE and
+    # LD_DYLIB_INSTALL_NAME affect -install_name.
+    'DYLIB_INSTALL_NAME_BASE':
+        '@executable_path/../Versions/<(version_full)',
+    # 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',
+  },
+  'includes': [
+    'chrome_nibs.gypi',
+  ],
+  # TODO(mark): Come up with a fancier way to do this.  It should
+  # only be necessary to list framework-Info.plist once, not the
+  # three times it is listed here.
+  'mac_bundle_resources': [
+    # This image is used to badge the lock icon in the
+    # authentication dialogs, such as those used for installation
+    # from disk image and Keystone promotion (if so enabled).  It
+    # needs to exist as a file on disk and not just something in a
+    # resource bundle because that's the interface that
+    # Authorization Services uses.  Also, Authorization Services
+    # can't deal with .icns files.
+    'app/theme/default_100_percent/<(theme_dir_name)/product_logo_32.png',
+
+    'app/framework-Info.plist',
+    '<@(mac_all_xibs)',
+    'app/theme/find_next_Template.pdf',
+    'app/theme/find_prev_Template.pdf',
+    'app/theme/menu_overflow_down.pdf',
+    'app/theme/menu_overflow_up.pdf',
+    'browser/mac/install.sh',
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
+    '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
+    '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
+    # Note: pseudo_locales are generated via the packed_resources
+    # dependency but not copied to the final target.  See
+    # common.gypi for more info.
+  ],
+  'mac_bundle_resources!': [
+    'app/framework-Info.plist',
+  ],
+  'dependencies': [
+    'app_mode_app',
+    # Bring in pdfsqueeze and run it on all pdfs
+    '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
+    '../crypto/crypto.gyp:crypto',
+    # On Mac, Flash gets put into the framework, so we need this
+    # dependency here. flash_player.gyp will copy the Flash bundle
+    # into PRODUCT_DIR.
+    '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
+    '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
+    'chrome_resources.gyp:packed_extra_resources',
+    'chrome_resources.gyp:packed_resources',
+  ],
+  'rules': [
+    {
+      'rule_name': 'pdfsqueeze',
+      'extension': 'pdf',
+      'inputs': [
+        '<(PRODUCT_DIR)/pdfsqueeze',
+      ],
+      'outputs': [
+        '<(INTERMEDIATE_DIR)/pdfsqueeze/<(RULE_INPUT_ROOT).pdf',
+      ],
+      'action': ['<(PRODUCT_DIR)/pdfsqueeze',
+                 '<(RULE_INPUT_PATH)', '<@(_outputs)'],
+      'message': 'Running pdfsqueeze on <(RULE_INPUT_PATH)',
+    },
+  ],
+  'variables': {
+    'conditions': [
+      ['branding=="Chrome"', {
+        'theme_dir_name': 'google_chrome',
+      }, {  # else: 'branding!="Chrome"
+        'theme_dir_name': 'chromium',
+      }],
+    ],
+    'libpeer_target_type%': 'static_library',
+    'repack_path': '../tools/grit/grit/format/repack.py',
+  },
+  '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': ['<(tweak_info_plist_path)',
+                 '--breakpad=<(mac_breakpad_compiled_in)',
+                 '--breakpad_uploads=<(mac_breakpad_uploads)',
+                 '--keystone=0',
+                 '--scm=1',
+                 '--branding=<(branding)'],
+    },
+    {
+      'postbuild_name': 'Symlink Libraries',
+      'action': [
+        'ln',
+        '-fns',
+        'Versions/Current/Libraries',
+        '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries'
+      ],
+    },
+  ],
+  'copies': [
+    {
+      # Copy FFmpeg binaries for audio/video support.
+      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
+      'files': [
+        '<(PRODUCT_DIR)/ffmpegsumo.so',
+      ],
+    },
+    {
+      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
+      'files': [],
+      'conditions': [
+        ['internal_pdf', {
+          'files': [
+            '<(PRODUCT_DIR)/PDF.plugin',
+          ],
+        }],
+        ['disable_nacl!=1', {
+          'files': [
+            '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin',
+          ],
+          'conditions': [
+            ['target_arch=="x64"', {
+              'files': [
+                '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+              ],
+            }, {
+              'files': [
+                '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+              ],
+            }],
+          ],
+        }],
+      ],
+    },
+    {
+      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/PepperFlash',
+      'files': [],
+      'conditions': [
+        ['branding == "Chrome"', {
+          'files': [
+            '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin',
+          ],
+        }],
+      ],
+    },
+    {
+      # This file is used by the component installer.
+      # It is not a complete plug-in on its own.
+      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/',
+      'files': [],
+      'conditions': [
+        ['branding == "Chrome"', {
+          'files': [
+            '<(PRODUCT_DIR)/widevinecdmadapter.plugin',
+          ],
+        }],
+      ],
+    },
+    {
+      # Copy of resources used by tests.
+      'destination': '<(PRODUCT_DIR)',
+      'files': [
+          '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak'
+      ],
+    },
+    {
+      # Copy of resources used by tests.
+      'destination': '<(PRODUCT_DIR)/pseudo_locales',
+      'files': [
+          '<(SHARED_INTERMEDIATE_DIR)/<(pseudo_locales).pak'
+      ],
+    },
+    {
+      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/resources',
+      'files': [
+        # Loader bundle for platform apps.
+        '<(PRODUCT_DIR)/app_mode_loader.app',
+      ],
+    },
+  ],
+  'conditions': [
+    ['branding=="Chrome"', {
+      'copies': [
+        {
+          # This location is for the Mac build. Note that the
+          # copying of these files for Windows and Linux is handled
+          # in chrome.gyp, as Mac needs to be dropped inside the
+          # framework.
+          'destination':
+              '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Default Apps',
+          'files': ['<@(default_apps_list)'],
+        },
+      ],
+    }],
+    ['mac_breakpad==1', {
+      'variables': {
+        # A real .dSYM is needed for dump_syms to operate on.
+        'mac_real_dsym': 1,
+      },
+    }],
+    ['mac_breakpad_compiled_in==1', {
+      'dependencies': [
+        '../breakpad/breakpad.gyp:breakpad',
+        'app/policy/cloud_policy_codegen.gyp:policy',
+      ],
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
+          'files': [
+            '<(PRODUCT_DIR)/crash_inspector',
+            '<(PRODUCT_DIR)/crash_report_sender.app'
+          ],
+        },
+      ],
+    }],  # mac_breakpad_compiled_in
+    ['mac_keystone==1', {
+      'mac_bundle_resources': [
+        'browser/mac/keystone_promote_preflight.sh',
+        'browser/mac/keystone_promote_postflight.sh',
+      ],
+      'postbuilds': [
+        {
+          'postbuild_name': 'Copy KeystoneRegistration.framework',
+          'action': [
+            '../build/mac/copy_framework_unversioned.sh',
+            '-I',
+            '../third_party/googlemac/Releases/Keystone/KeystoneRegistration.framework',
+            '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Frameworks',
+          ],
+        },
+        {
+          'postbuild_name': 'Symlink Frameworks',
+          'action': [
+            'ln',
+            '-fns',
+            'Versions/Current/Frameworks',
+            '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Frameworks'
+          ],
+        },
+      ],
+    }],  # mac_keystone
+    ['internal_pdf', {
+      'dependencies': [
+        '../pdf/pdf.gyp:pdf',
+      ],
+    }],
+    ['debug_devtools==1', {
+      'postbuilds': [{
+        'postbuild_name': 'Copy inspector files',
+        'action': [
+          'cp',
+          '-r',
+          '${BUILT_PRODUCTS_DIR}/resources/inspector',
+          '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Resources',
+        ],
+      }],
+    }],
+    ['enable_hidpi==1', {
+      'mac_bundle_resources': [
+        '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
+      ],
+    }],
+    ['enable_webrtc==1 and libpeer_target_type!="static_library"', {
+      'copies': [{
+       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
+       'files': [
+          '<(PRODUCT_DIR)/libpeerconnection.so',
+        ],
+      }],
+    }],
+  ],  # conditions
+}
diff --git a/chromium/chrome/chrome_exe.gypi b/chromium/chrome/chrome_exe.gypi
new file mode 100644
index 00000000000..78047eb957c
--- /dev/null
+++ b/chromium/chrome/chrome_exe.gypi
@@ -0,0 +1,646 @@
+# Copyright (c) 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'chrome',
+      'type': 'executable',
+      'mac_bundle': 1,
+      'variables': {
+        'use_system_xdg_utils%': 0,
+        'enable_wexit_time_destructors': 1,
+      },
+      'sources': [
+        'app/breakpad_field_trial_win.cc',
+        'app/breakpad_field_trial_win.h',
+        'app/breakpad_win.cc',
+        'app/breakpad_win.h',
+        'app/chrome_exe_main_aura.cc',
+        'app/chrome_exe_main_gtk.cc',
+        'app/chrome_exe_main_mac.cc',
+        'app/chrome_exe_main_win.cc',
+        'app/chrome_exe_resource.h',
+        'app/client_util.cc',
+        'app/client_util.h',
+        'app/hard_error_handler_win.cc',
+        'app/hard_error_handler_win.h',
+        'app/metro_driver_win.cc',
+        'app/metro_driver_win.h',
+        '../content/app/startup_helper_win.cc',
+      ],
+      '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': {
+        'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves',
+        'INFOPLIST_FILE': 'app/app-Info.plist',
+      },
+      'conditions': [
+        ['component == "shared_library"', {
+          'variables': {
+            'win_use_external_manifest': 1,
+          },
+        }],
+        ['order_profiling!=0 and (chromeos==1 or OS=="linux")', {
+          'dependencies' : [
+            '../tools/cygprofile/cygprofile.gyp:cygprofile',
+          ],
+        }],
+        ['order_text_section!=""', {
+          'target_conditions' : [
+            ['_toolset=="target"', {
+              'ldflags': [
+                '-Wl,-section-ordering-file=<(order_text_section)' ],
+            }],
+          ]
+        }],
+        ['OS == "win" and use_aura==1', {
+          'sources!': [
+            # We still want the _win entry point for sandbox, etc.
+            'app/chrome_exe_main_aura.cc',
+          ],
+        }],
+        ['OS == "android"', {
+          # Don't put the 'chrome' target in 'all' on android
+          'suppress_wildcard': 1,
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
+          'actions': [
+            {
+              'action_name': 'manpage',
+              'conditions': [
+                [ 'branding == "Chrome"', {
+                  'variables': {
+                    'name': 'Google Chrome',
+                    'filename': 'google-chrome',
+                    'confdir': 'google-chrome',
+                  },
+                }, { # else branding!="Chrome"
+                  'variables': {
+                    'name': 'Chromium',
+                    'filename': 'chromium-browser',
+                    'confdir': 'chromium',
+                  },
+                }],
+              ],
+              'inputs': [
+                'tools/build/linux/sed.sh',
+                'app/resources/manpage.1.in',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/chrome.1',
+              ],
+              'action': [
+                'tools/build/linux/sed.sh',
+                'app/resources/manpage.1.in',
+                '<@(_outputs)',
+                '-e', 's/@@NAME@@/<(name)/',
+                '-e', 's/@@FILENAME@@/<(filename)/',
+                '-e', 's/@@CONFDIR@@/<(confdir)/',
+              ],
+              'message': 'Generating manpage'
+            },
+          ],
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+                'dependencies': [
+                  '<(allocator_target)',
+                ],
+              },
+            ],
+            ['profiling==0 and linux_disable_pie==0', {
+              'ldflags': [
+                '-pie',
+              ],
+            }],
+            ['use_system_xdg_utils==0', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': ['tools/build/linux/chrome-wrapper',
+                            '../third_party/xdg-utils/scripts/xdg-mime',
+                            '../third_party/xdg-utils/scripts/xdg-settings',
+                            ],
+                  # The wrapper script above may need to generate a .desktop
+                  # file, which requires an icon. So, copy one next to the
+                  # script.
+                  'conditions': [
+                    ['branding=="Chrome"', {
+                      'files': ['app/theme/google_chrome/product_logo_48.png']
+                    }, { # else: 'branding!="Chrome"
+                      'files': ['app/theme/chromium/product_logo_48.png']
+                    }],
+                  ],
+                },
+              ],
+            }],
+            ['toolkit_uses_gtk == 1', {
+              'dependencies': [
+                # On Linux, link the dependencies (libraries) that make up actual
+                # Chromium functionality directly into the executable.
+                '<@(chromium_browser_dependencies)',
+                '<@(chromium_child_dependencies)',
+                '../content/content.gyp:content_app_both',
+                # Needed for chrome_main.cc initialization of libraries.
+                '../build/linux/system.gyp:gtk',
+                # Needed to use the master_preferences functions
+                'installer_util',
+              ],
+            }, { # else toolkit_uses_gtk == 1
+              'dependencies': [
+                # On Linux, link the dependencies (libraries) that make up actual
+                # Chromium functionality directly into the executable.
+                '<@(chromium_browser_dependencies)',
+                '<@(chromium_child_dependencies)',
+                '../content/content.gyp:content_app_both',
+                # Needed for chrome_main.cc initialization of libraries.
+                '../build/linux/system.gyp:x11',
+                '../build/linux/system.gyp:pangocairo',
+                '../build/linux/system.gyp:xext',
+                # Needed to use the master_preferences functions
+                'installer_util',
+              ],
+            }],
+          ],
+          'sources': [
+            'app/chrome_dll_resource.h',
+            'app/chrome_main.cc',
+            'app/chrome_main_delegate.cc',
+            'app/chrome_main_delegate.h',
+          ],
+        }],
+        ['OS=="mac"', {
+          # 'branding' is a variable defined in common.gypi
+          # (e.g. "Chromium", "Chrome")
+          'conditions': [
+            ['branding=="Chrome"', {
+              'mac_bundle_resources': [
+                'app/theme/google_chrome/app.icns',
+                'app/theme/google_chrome/document.icns',
+                'browser/ui/cocoa/applescript/scripting.sdef',
+              ],
+            }, {  # else: 'branding!="Chrome"
+              'mac_bundle_resources': [
+                'app/theme/chromium/app.icns',
+                'app/theme/chromium/document.icns',
+                'browser/ui/cocoa/applescript/scripting.sdef',
+              ],
+            }],
+            ['mac_breakpad==1', {
+              'variables': {
+                # A real .dSYM is needed for dump_syms to operate on.
+                'mac_real_dsym': 1,
+              },
+              'xcode_settings': {
+                # With mac_real_dsym set, strip_from_xcode won't be used.
+                # Specify CHROMIUM_STRIP_SAVE_FILE directly to Xcode.
+                'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)',
+              },
+              'dependencies': [
+                '../breakpad/breakpad.gyp:dump_syms',
+                '../breakpad/breakpad.gyp:symupload',
+
+                # In order to process symbols for the Remoting Host plugin,
+                # that plugin needs to be built beforehand.  Since the
+                # "Dump Symbols" step hangs off this target, that plugin also
+                # needs to be added as a dependency.
+                '../remoting/remoting.gyp:remoting_host_plugin',
+              ],
+              # The "Dump Symbols" post-build step is in a target_conditions
+              # block so that it will follow the "Strip If Needed" step if that
+              # is also being used.  There is no standard configuration where
+              # both of these steps occur together, but Mark likes to use this
+              # configuration sometimes when testing Breakpad-enabled builds
+              # without the time overhead of creating real .dSYM files.  When
+              # both "Dump Symbols" and "Strip If Needed" are present, "Dump
+              # Symbols" must come second because "Strip If Needed" creates
+              # a fake .dSYM that dump_syms needs to fake dump.  Since
+              # "Strip If Needed" is added in a target_conditions block in
+              # common.gypi, "Dump Symbols" needs to be in an (always true)
+              # target_conditions block.
+              'target_conditions': [
+                ['1 == 1', {
+                  'postbuilds': [
+                    {
+                      'postbuild_name': 'Dump Symbols',
+                      'variables': {
+                        'dump_product_syms_path':
+                            'tools/build/mac/dump_product_syms',
+                      },
+                      'action': ['<(dump_product_syms_path)',
+                                 '<(branding)'],
+                    },
+                  ],
+                }],
+              ],
+            }],  # mac_breakpad
+          ],
+          'product_name': '<(mac_product_name)',
+          'xcode_settings': {
+            # chrome/app/app-Info.plist has:
+            #   CFBundleIdentifier of CHROMIUM_BUNDLE_ID
+            #   CFBundleName of CHROMIUM_SHORT_NAME
+            #   CFBundleSignature of CHROMIUM_CREATOR
+            # Xcode then replaces these values with the branded values we set
+            # as settings on the target.
+            'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
+            'CHROMIUM_CREATOR': '<(mac_creator)',
+            'CHROMIUM_SHORT_NAME': '<(branding)',
+          },
+          'dependencies': [
+            'helper_app',
+            'infoplist_strings_tool',
+            'interpose_dependency_shim',
+            'chrome_manifest_bundle',
+            # On Mac, make sure we've built chrome_dll, which contains all of
+            # the library code with Chromium functionality.
+            'chrome_dll',
+          ],
+          'mac_bundle_resources': [
+            '<(PRODUCT_DIR)/<(mac_bundle_id).manifest',
+          ],
+          'actions': [
+            {
+              # Generate the InfoPlist.strings file
+              'action_name': 'Generate InfoPlist.strings files',
+              'variables': {
+                'tool_path': '<(PRODUCT_DIR)/infoplist_strings_tool',
+                # Unique dir to write to so the [lang].lproj/InfoPlist.strings
+                # for the main app and the helper app don't name collide.
+                'output_path': '<(INTERMEDIATE_DIR)/app_infoplist_strings',
+              },
+              'conditions': [
+                [ 'branding == "Chrome"', {
+                  'variables': {
+                     'branding_name': 'google_chrome_strings',
+                  },
+                }, { # else branding!="Chrome"
+                  'variables': {
+                     'branding_name': 'chromium_strings',
+                  },
+                }],
+              ],
+              'inputs': [
+                '<(tool_path)',
+                '<(version_path)',
+                # TODO: remove this helper when we have loops in GYP
+                '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(branding_name)_ZZLOCALE.pak\' <(locales))',
+              ],
+              'outputs': [
+                # TODO: remove this helper when we have loops in GYP
+                '>!@(<(apply_locales_cmd) -d \'<(output_path)/ZZLOCALE.lproj/InfoPlist.strings\' <(locales))',
+              ],
+              'action': [
+                '<(tool_path)',
+                '-b', '<(branding_name)',
+                '-v', '<(version_path)',
+                '-g', '<(grit_out_dir)',
+                '-o', '<(output_path)',
+                '-t', 'main',
+                '<@(locales)',
+              ],
+              'message': 'Generating the language InfoPlist.strings files',
+              'process_outputs_as_mac_bundle_resources': 1,
+            },
+          ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Versions/<(version_full)',
+              'files': [
+                '<(PRODUCT_DIR)/<(mac_product_name) Helper.app',
+                '<(PRODUCT_DIR)/libplugin_carbon_interpose.dylib',
+              ],
+            },
+          ],
+          'postbuilds': [
+            {
+              'postbuild_name': 'Copy <(mac_product_name) Framework.framework',
+              'action': [
+                '../build/mac/copy_framework_unversioned.sh',
+                '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Framework.framework',
+                '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Versions/<(version_full)',
+              ],
+            },
+            {
+              # Modify the Info.plist as needed.  The script explains why this
+              # is needed.  This is also done in the helper_app and chrome_dll
+              # targets.  Use --breakpad=0 to not include any Breakpad
+              # information; that all goes into the framework's Info.plist.
+              # Keystone information is included if Keystone is enabled.  The
+              # application reads Keystone keys from this plist and not the
+              # framework's, and the ticket will reference this Info.plist to
+              # determine the tag of the installed product.  Use --scm=1 to
+              # include SCM information.  The --pdf flag controls whether
+              # to insert PDF as a supported type identifier that can be
+              # opened.
+              'postbuild_name': 'Tweak Info.plist',
+              'action': ['<(tweak_info_plist_path)',
+                         '--breakpad=0',
+                         '--keystone=<(mac_keystone)',
+                         '--scm=1',
+                         '--pdf=<(internal_pdf)',
+                         '--bundle_id=<(mac_bundle_id)'],
+            },
+            {
+              'postbuild_name': 'Clean up old versions',
+              'action': [
+                'tools/build/mac/clean_up_old_versions',
+                '<(version_full)'
+              ],
+            },
+            {
+              # This postbuid step is responsible for creating the following
+              # helpers:
+              #
+              # For unofficial Chromium branding, Chromium Helper EH.app and
+              # Chromium Helper NP.app are created from Chromium Helper.app.
+              # For official Google Chrome branding, Google Chrome Helper
+              # EH.app and Google Chrome Helper NP.app are created from
+              # Google Chrome Helper.app.
+              #
+              # The EH helper is marked for an executable heap. The NP helper
+              # is marked for no PIE (ASLR).
+              #
+              # Normally, applications shipping as part of offical builds with
+              # Google Chrome branding have dsymutil (dwarf-with-dsym,
+              # mac_real_dsym) and dump_syms (mac_breakpad) run on them to
+              # produce a .dSYM bundle and a Breakpad .sym file. This is
+              # unnecessary for the "More Helpers" because they're identical
+              # to the original helper except for the bits in their Mach-O
+              # headers that change to enable or disable special features.
+              # Each .dSYM is identified by UUID stored in a Mach-O file's
+              # LC_UUID load command. Because the "More Helpers" share a UUID
+              # with the original helper, there's no need to run dsymutil
+              # again. All helpers can share the same .dSYM. Special handling
+              # is performed in chrome/tools/build/mac/dump_product_syms to
+              # prepare their Breakpad symbol files.
+              'postbuild_name': 'Make More Helpers',
+              'action': [
+                '../build/mac/make_more_helpers.sh',
+                'Versions/<(version_full)',
+                '<(mac_product_name)',
+              ],
+            },
+            {
+              # Make sure there isn't any Objective-C in the browser app's
+              # executable.
+              'postbuild_name': 'Verify No Objective-C',
+              'action': [
+                '../build/mac/verify_no_objc.sh',
+              ],
+            },
+          ],  # postbuilds
+        }, {  # OS != "mac"
+          'conditions': [
+            # TODO:  add a:
+            #   'product_name': 'chromium'
+            # whenever we convert the rest of the infrastructure
+            # (buildbots etc.) to understand the branding gyp define.
+            # NOTE: chrome/app/theme/chromium/BRANDING and
+            # chrome/app/theme/google_chrome/BRANDING have the short name
+            # "chrome" etc.; should we try to extract from there instead?
+
+            # On Mac, this is done in chrome_dll.gypi.
+            ['internal_pdf', {
+              'dependencies': [
+                '../pdf/pdf.gyp:pdf',
+              ],
+              'conditions': [
+                # CrOS does this in a separate build step.
+                ['OS=="linux" and chromeos==0 and linux_dump_symbols==1', {
+                  'dependencies': [
+                    '../pdf/pdf.gyp:pdf_linux_symbols',
+                  ],
+                }], # OS=="linux" and chromeos==0 and linux_dump_symbols==1
+              ],
+            }], # internal_pdf
+          ],
+          'dependencies': [
+            'chrome_resources.gyp:packed_extra_resources',
+            'chrome_resources.gyp:packed_resources',
+            # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
+            # file decide what to do on a per-OS basis; on Mac, internal plugins
+            # go inside the framework, so this dependency is in chrome_dll.gypi.
+            '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
+            # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp
+            # file decide what to do on a per-OS basis; on Mac, internal plugins
+            # go inside the framework, so this dependency is in chrome_dll.gypi.
+            '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
+          ],
+        }],
+        ['OS=="mac" and asan==1', {
+          'xcode_settings': {
+            # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE.
+            'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
+          },
+        }],
+        ['OS=="linux"', {
+          'conditions': [
+            ['branding=="Chrome"', {
+              'dependencies': [
+                'linux_installer_configs',
+              ],
+            }],
+            # For now, do not build nacl_helper when disable_nacl=1
+            # http://code.google.com/p/gyp/issues/detail?id=239
+            ['disable_nacl==0 and coverage==0', {
+              'dependencies': [
+                '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
+                'nacl_helper',
+                ],
+            }],
+          ],
+          'dependencies': [
+            '../sandbox/sandbox.gyp:sandbox',
+          ],
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            'chrome_dll',
+            'chrome_nacl_win64',
+            'chrome_process_finder',
+            'chrome_version_resources',
+            'installer_util',
+            'image_pre_reader',
+            '../base/base.gyp:base',
+            '../breakpad/breakpad.gyp:breakpad_handler',
+            '../breakpad/breakpad.gyp:breakpad_sender',
+            '../components/components.gyp:breakpad_component',
+            '../sandbox/sandbox.gyp:sandbox',
+            'app/policy/cloud_policy_codegen.gyp:policy',
+          ],
+          'sources': [
+            'app/chrome_breakpad_client.cc',
+            'app/chrome_breakpad_client.h',
+            'app/chrome_exe.rc',
+            'common/crash_keys.cc',
+            'common/crash_keys.h',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
+              'DelayLoadDLLs': [
+                'dbghelp.dll',
+                'dwmapi.dll',
+                'uxtheme.dll',
+                'ole32.dll',
+                'oleaut32.dll',
+              ],
+              # Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
+              'SubSystem': '2',
+            },
+            'VCManifestTool': {
+              'AdditionalManifestFiles': [
+                '$(ProjectDir)\\app\\chrome.exe.manifest',
+              ],
+            },
+          },
+          'actions': [
+            {
+              'action_name': 'first_run',
+              'inputs': [
+                  'app/FirstRun',
+              ],
+              'outputs': [
+                  '<(PRODUCT_DIR)/First Run',
+              ],
+              'action': ['cp', '-f', '<@(_inputs)', '<@(_outputs)'],
+              'message': 'Copy first run complete sentinel file',
+              'msvs_cygwin_shell': 1,
+            },
+          ],
+        }, {  # 'OS!="win"
+          'sources!': [
+            'app/client_util.cc',
+          ],
+        }],
+        ['OS=="win" and component=="shared_library"', {
+          'defines': ['COMPILE_CONTENT_STATICALLY'],
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            '../win8/metro_driver/metro_driver.gyp:*',
+            '../win8/delegate_execute/delegate_execute.gyp:*',
+          ],
+        }],
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'image_pre_reader',
+          'type': 'static_library',
+          'sources': [
+            'app/image_pre_reader_win.cc',
+            'app/image_pre_reader_win.h',
+          ],
+          'dependencies': [
+             '../base/base.gyp:base',
+          ],
+        },
+      ],
+      'conditions': [
+        ['disable_nacl!=1 and target_arch=="ia32"', {
+          'targets': [
+            {
+              'target_name': 'chrome_nacl_win64',
+              'type': 'executable',
+              'product_name': 'nacl64',
+              'sources': [
+                'app/breakpad_win.cc',
+                'app/chrome_breakpad_client.cc',
+                'app/hard_error_handler_win.cc',
+                'common/crash_keys.cc',
+                'nacl/nacl_exe_win_64.cc',
+                '../content/app/startup_helper_win.cc',
+                '../content/common/sandbox_init_win.cc',
+                '../content/common/sandbox_win.cc',
+                '../content/public/common/content_switches.cc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc',
+              ],
+              'dependencies': [
+                'app/policy/cloud_policy_codegen.gyp:policy_win64',
+                'chrome_version_resources',
+                'installer_util_nacl_win64',
+                '../breakpad/breakpad.gyp:breakpad_handler_win64',
+                '../breakpad/breakpad.gyp:breakpad_sender_win64',
+                '../base/base.gyp:base_i18n_nacl_win64',
+                '../base/base.gyp:base_nacl_win64',
+                '../base/base.gyp:base_static_win64',
+                '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
+                '../components/components.gyp:breakpad_win64',
+                '../chrome/common_constants.gyp:common_constants_win64',
+                '../components/nacl.gyp:nacl_win64',
+                '../crypto/crypto.gyp:crypto_nacl_win64',
+                '../ipc/ipc.gyp:ipc_win64',
+                '../sandbox/sandbox.gyp:sandbox_win64',
+              ],
+              'defines': [
+                '<@(nacl_win64_defines)',
+                'COMPILE_CONTENT_STATICALLY',
+              ],
+              'include_dirs': [
+                '<(SHARED_INTERMEDIATE_DIR)/chrome',
+              ],
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
+                  'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
+                },
+              },
+              'configurations': {
+                'Common_Base': {
+                  'msvs_target_platform': 'x64',
+                },
+              },
+            },
+          ],
+        }, {  # else (disable_nacl==1)
+          'targets': [
+            {
+              'target_name': 'chrome_nacl_win64',
+              'type': 'none',
+              'sources': [],
+            },
+          ],
+        }],
+      ],
+    }],
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'chrome_run',
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+            'chrome.isolate',
+          ],
+          'sources': [
+            'chrome.isolate',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'dependencies': [
+                'chrome_nacl_win64',
+              ],
+            }],
+          ],
+        },
+      ],
+    }],
+  ],
+}
diff --git a/chromium/chrome/chrome_installer.gypi b/chromium/chrome/chrome_installer.gypi
new file mode 100644
index 00000000000..f4c5f5d9d70
--- /dev/null
+++ b/chromium/chrome/chrome_installer.gypi
@@ -0,0 +1,1230 @@
+# Copyright (c) 2012 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': {
+    'lastchange_path': '../build/util/LASTCHANGE',
+    'libpeer_target_type%': 'static_library',
+    # 'branding_dir' is set in the 'conditions' section at the bottom.
+  },
+  'conditions': [
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'gcapi_dll',
+          'type': 'loadable_module',
+          'dependencies': [
+            'gcapi_lib',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'installer/gcapi/gcapi.def',
+            'installer/gcapi/gcapi_dll.cc',
+          ],
+        },
+        {
+          'target_name': 'gcapi_lib',
+          'type': 'static_library',
+          'dependencies': [
+            'installer_util',
+            '../base/base.gyp:base',
+            '../chrome/chrome.gyp:launcher_support',
+            '../google_update/google_update.gyp:google_update',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'installer/gcapi/gcapi.cc',
+            'installer/gcapi/gcapi.h',
+            'installer/gcapi/gcapi_omaha_experiment.cc',
+            'installer/gcapi/gcapi_omaha_experiment.h',
+            'installer/gcapi/gcapi_reactivation.cc',
+            'installer/gcapi/gcapi_reactivation.h',
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        },
+        {
+          'target_name': 'gcapi_test',
+          'type': 'executable',
+          'dependencies': [
+            'common',
+            'gcapi_dll',
+            'gcapi_lib',
+            'installer_util',
+            '../base/base.gyp:base',
+            '../base/base.gyp:test_support_base',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'installer/gcapi/gcapi_last_run_test.cc',
+            'installer/gcapi/gcapi_reactivation_test.cc',
+            'installer/gcapi/gcapi_test.cc',
+            'installer/gcapi/gcapi_test.rc',
+            'installer/gcapi/resource.h',
+          ],
+        },
+        {
+          'target_name': 'installer_util_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'installer_util',
+            'installer_util_strings',
+            'installer/upgrade_test.gyp:alternate_version_generator_lib',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../base/base.gyp:test_support_base',
+            '../chrome/chrome.gyp:chrome_version_resources',
+            '../content/content.gyp:content_common',
+            '../testing/gmock.gyp:gmock',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'installer/setup/compat_checks_unittest.cc',
+            'installer/setup/setup_constants.cc',
+            'installer/util/callback_work_item_unittest.cc',
+            'installer/util/channel_info_unittest.cc',
+            'installer/util/copy_reg_key_work_item_unittest.cc',
+            'installer/util/copy_tree_work_item_unittest.cc',
+            'installer/util/create_dir_work_item_unittest.cc',
+            'installer/util/create_reg_key_work_item_unittest.cc',
+            'installer/util/delete_after_reboot_helper_unittest.cc',
+            'installer/util/delete_reg_key_work_item_unittest.cc',
+            'installer/util/delete_reg_value_work_item_unittest.cc',
+            'installer/util/delete_tree_work_item_unittest.cc',
+            'installer/util/duplicate_tree_detector_unittest.cc',
+            'installer/util/fake_installation_state.h',
+            'installer/util/fake_product_state.h',
+            'installer/util/google_update_settings_unittest.cc',
+            'installer/util/install_util_unittest.cc',
+            'installer/util/installation_validation_helper.cc',
+            'installer/util/installation_validation_helper.h',
+            'installer/util/installation_validator_unittest.cc',
+            'installer/util/installer_state_unittest.cc',
+            'installer/util/installer_util_test_common.cc',
+            'installer/util/installer_util_test_common.h',
+            'installer/util/installer_util_unittests.rc',
+            'installer/util/installer_util_unittests_resource.h',
+            'installer/util/language_selector_unittest.cc',
+            'installer/util/logging_installer_unittest.cc',
+            'installer/util/lzma_util_unittest.cc',
+            'installer/util/master_preferences_unittest.cc',
+            'installer/util/move_tree_work_item_unittest.cc',
+            'installer/util/product_state_unittest.cc',
+            'installer/util/product_unittest.cc',
+            'installer/util/product_unittest.h',
+            'installer/util/registry_key_backup_unittest.cc',
+            'installer/util/registry_test_data.cc',
+            'installer/util/registry_test_data.h',
+            'installer/util/run_all_unittests.cc',
+            'installer/util/self_cleaning_temp_dir_unittest.cc',
+            'installer/util/set_reg_value_work_item_unittest.cc',
+            'installer/util/shell_util_unittest.cc',
+            'installer/util/uninstall_metrics_unittest.cc',
+            'installer/util/wmi_unittest.cc',
+            'installer/util/work_item_list_unittest.cc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+          ],
+          'msvs_settings': {
+            'VCManifestTool': {
+              'AdditionalManifestFiles': [
+                '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
+              ],
+            },
+          },
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        },
+        {
+          'target_name': 'installer_util_strings',
+          'type': 'none',
+          'rules': [
+            {
+              'rule_name': 'installer_util_strings',
+              'extension': 'grd',
+              'variables': {
+                'create_string_rc_py' : 'installer/util/prebuild/create_string_rc.py',
+              },
+              'inputs': [
+                '<(create_string_rc_py)',
+                '<(RULE_INPUT_PATH)',
+              ],
+              'outputs': [
+                # Don't use <(RULE_INPUT_ROOT) to create the output file
+                # name, because the base name of the input
+                # (generated_resources.grd) doesn't match the generated file
+                # (installer_util_strings.h).
+                '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h',
+                '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+              ],
+              'action': ['python',
+                         '<(create_string_rc_py)',
+                         '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
+                         '<(branding)',],
+              'message': 'Generating resources from <(RULE_INPUT_PATH)',
+              'msvs_cygwin_shell': 1,
+            },
+          ],
+          'sources': [
+            'app/chromium_strings.grd',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
+            ],
+          },
+        },
+        {
+          'target_name': 'launcher_support',
+          'type': 'static_library',
+          'include_dirs': [
+            '..',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '..',
+            ],
+          },
+          'dependencies': [
+            '<(DEPTH)/base/base.gyp:base',
+          ],
+          'sources': [
+            'installer/launcher_support/chrome_launcher_support.cc',
+            'installer/launcher_support/chrome_launcher_support.h',
+          ],
+        },
+        {
+          'target_name': 'mini_installer_test',
+          'type': 'executable',
+          'dependencies': [
+            'installer_util',
+            'installer_util_strings',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../base/base.gyp:test_support_base',
+            '../chrome/chrome.gyp:test_support_common',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+            'installer/util/installation_validation_helper.cc',
+            'installer/util/installation_validation_helper.h',
+            'test/mini_installer_test/installer_path_provider.cc',
+            'test/mini_installer_test/installer_path_provider.h',
+            'test/mini_installer_test/installer_test_util.cc',
+            'test/mini_installer_test/installer_test_util.h',
+            'test/mini_installer_test/mini_installer_test_constants.cc',
+            'test/mini_installer_test/mini_installer_test_constants.h',
+            'test/mini_installer_test/run_all_unittests.cc',
+            'test/mini_installer_test/switch_builder.cc',
+            'test/mini_installer_test/switch_builder.h',
+            'test/mini_installer_test/test.cc',
+          ],
+          'msvs_settings': {
+            'VCManifestTool': {
+              'AdditionalManifestFiles': [
+                '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
+              ],
+            },
+          },
+        },
+        {
+          'target_name': 'setup',
+          'type': 'executable',
+          'dependencies': [
+            'installer_util',
+            'installer_util_strings',
+            'launcher_support',
+            '../base/base.gyp:base',
+            '../breakpad/breakpad.gyp:breakpad_handler',
+            '../chrome/common_constants.gyp:common_constants',
+            '../chrome_frame/chrome_frame.gyp:chrome_tab_idl',
+            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+            '../rlz/rlz.gyp:rlz_lib',
+            '../third_party/zlib/zlib.gyp:zlib',
+          ],
+          'include_dirs': [
+            '..',
+            '<(INTERMEDIATE_DIR)',
+            '<(SHARED_INTERMEDIATE_DIR)/setup',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)/setup',
+            ],
+          },
+          'sources': [
+            'installer/mini_installer/chrome.release',
+            'installer/setup/archive_patch_helper.cc',
+            'installer/setup/archive_patch_helper.h',
+            'installer/setup/chrome_frame_quick_enable.cc',
+            'installer/setup/chrome_frame_quick_enable.h',
+            'installer/setup/chrome_frame_ready_mode.cc',
+            'installer/setup/chrome_frame_ready_mode.h',
+            'installer/setup/install.cc',
+            'installer/setup/install.h',
+            'installer/setup/install_worker.cc',
+            'installer/setup/install_worker.h',
+            'installer/setup/setup_main.cc',
+            'installer/setup/setup_main.h',
+            'installer/setup/setup.ico',
+            'installer/setup/setup.rc',
+            'installer/setup/setup_constants.cc',
+            'installer/setup/setup_constants.h',
+            'installer/setup/setup_exe_version.rc.version',
+            'installer/setup/setup_resource.h',
+            'installer/setup/setup_util.cc',
+            'installer/setup/setup_util.h',
+            'installer/setup/uninstall.cc',
+            'installer/setup/uninstall.h',
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
+            },
+            'VCManifestTool': {
+              'AdditionalManifestFiles': [
+                '$(ProjectDir)\\installer\\setup\\setup.exe.manifest',
+              ],
+            },
+          },
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+          'rules': [
+            {
+              'rule_name': 'setup_version',
+              'extension': 'version',
+              'variables': {
+                'version_py_path': '../chrome/tools/build/version.py',
+                'template_input_path': 'installer/setup/setup_exe_version.rc.version',
+              },
+              'inputs': [
+                '<(template_input_path)',
+                '<(version_path)',
+                '<(lastchange_path)',
+                '<(branding_dir)/BRANDING',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/setup/setup_exe_version.rc',
+              ],
+              'action': [
+                'python', '<(version_py_path)',
+                '-f', '<(version_path)',
+                '-f', '<(lastchange_path)',
+                '-f', '<(branding_dir)/BRANDING',
+                '<(template_input_path)',
+                '<@(_outputs)',
+              ],
+              'process_outputs_as_sources': 1,
+              'message': 'Generating version information'
+            },
+            {
+              'rule_name': 'server_dlls',
+              'extension': 'release',
+              'variables': {
+                'scan_server_dlls_py' : 'tools/build/win/scan_server_dlls.py',
+                'template_file': 'installer/mini_installer/chrome.release',
+              },
+              'inputs': [
+                '<(scan_server_dlls_py)',
+                '<(template_file)'
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/registered_dlls.h',
+              ],
+              'action': [
+                'python',
+                '<(scan_server_dlls_py)',
+                '--output_dir=<(PRODUCT_DIR)',
+                '--input_file=<(RULE_INPUT_PATH)',
+                '--header_output_dir=<(INTERMEDIATE_DIR)',
+                # TODO(sgk):  may just use environment variables
+                #'--distribution=$(CHROMIUM_BUILD)',
+                '--distribution=_google_chrome',
+              ],
+              'msvs_cygwin_shell': 1,
+            },
+          ],
+          'conditions': [
+            ['component == "shared_library"', {
+              'variables': {
+                'win_use_external_manifest': 1,
+              },
+            }],
+            # TODO(mark):  <(branding_dir) should be defined by the
+            # global condition block at the bottom of the file, but
+            # this doesn't work due to the following issue:
+            #
+            #   http://code.google.com/p/gyp/issues/detail?id=22
+            #
+            # Remove this block once the above issue is fixed.
+            [ 'branding == "Chrome"', {
+              'variables': {
+                 'branding_dir': 'app/theme/google_chrome',
+                 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
+              },
+            }, { # else branding!="Chrome"
+              'variables': {
+                 'branding_dir': 'app/theme/chromium',
+                 'branding_dir_100': 'app/theme/default_100_percent/chromium',
+              },
+            }],
+            ['target_arch=="x64"', {
+              'dependencies!': [
+                '../chrome_frame/chrome_frame.gyp:chrome_tab_idl',
+                '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+              ],
+              'defines': [
+                'OMIT_CHROME_FRAME',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'setup_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'installer_util',
+            'installer_util_strings',
+            'launcher_support',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../base/base.gyp:test_support_base',
+            '../chrome_frame/chrome_frame.gyp:chrome_tab_idl',
+            '../testing/gmock.gyp:gmock',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'include_dirs': [
+            '..',
+            '<(INTERMEDIATE_DIR)',
+          ],
+          # TODO(robertshield): Move the items marked with "Move to lib"
+          # below into a separate lib and then link both setup.exe and
+          # setup_unittests.exe against that.
+          'sources': [
+            'installer/mini_installer/chrome.release',  # Move to lib
+            'installer/mini_installer/appid.h',
+            'installer/mini_installer/chrome_appid.cc',
+            'installer/mini_installer/configuration.cc',
+            'installer/mini_installer/configuration.h',
+            'installer/mini_installer/configuration_test.cc',
+            'installer/mini_installer/decompress.cc',
+            'installer/mini_installer/decompress.h',
+            'installer/mini_installer/decompress_test.cc',
+            'installer/mini_installer/mini_string.cc',
+            'installer/mini_installer/mini_string.h',
+            'installer/mini_installer/mini_string_test.cc',
+            'installer/setup/archive_patch_helper.cc',  # Move to lib
+            'installer/setup/archive_patch_helper.h',   # Move to lib
+            'installer/setup/archive_patch_helper_unittest.cc',
+            'installer/setup/install.cc',               # Move to lib
+            'installer/setup/install.h',                # Move to lib
+            'installer/setup/install_unittest.cc',
+            'installer/setup/install_worker.cc',        # Move to lib
+            'installer/setup/install_worker.h',         # Move to lib
+            'installer/setup/install_worker_unittest.cc',
+            'installer/setup/run_all_unittests.cc',
+            'installer/setup/setup_constants.cc',       # Move to lib
+            'installer/setup/setup_constants.h',        # Move to lib
+            'installer/setup/setup_unittests.rc',
+            'installer/setup/setup_unittests_resource.h',
+            'installer/setup/setup_util.cc',
+            'installer/setup/setup_util_unittest.cc',
+            'installer/setup/setup_util_unittest.h',
+          ],
+          'rules': [
+            {
+              'rule_name': 'server_dlls',               # Move to lib
+              'extension': 'release',
+              'variables': {
+                'scan_server_dlls_py' : 'tools/build/win/scan_server_dlls.py',
+                'template_file': 'installer/mini_installer/chrome.release',
+              },
+              'inputs': [
+                '<(scan_server_dlls_py)',
+                '<(template_file)'
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/registered_dlls.h',
+              ],
+              'action': [
+                'python',
+                '<(scan_server_dlls_py)',
+                '--output_dir=<(PRODUCT_DIR)',
+                '--input_file=<(RULE_INPUT_PATH)',
+                '--header_output_dir=<(INTERMEDIATE_DIR)',
+                # TODO(sgk):  may just use environment variables
+                #'--distribution=$(CHROMIUM_BUILD)',
+                '--distribution=_google_chrome',
+              ],
+              'msvs_cygwin_shell': 1,
+            },
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        },
+      ],
+    }],
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
+          'target_name': 'launcher_support64',
+          'type': 'static_library',
+          'include_dirs': [
+            '..',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '..',
+            ],
+          },
+          'defines': [
+              '<@(nacl_win64_defines)',
+          ],
+              'dependencies': [
+              '<(DEPTH)/base/base.gyp:base_nacl_win64',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+          'sources': [
+            'installer/launcher_support/chrome_launcher_support.cc',
+            'installer/launcher_support/chrome_launcher_support.h',
+          ],
+        },
+      ],
+    }],
+    ['OS=="linux" and branding=="Chrome"', {
+      'variables': {
+        # Always google_chrome since this only applies to branding==Chrome.
+        'branding_dir': 'app/theme/google_chrome',
+        'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
+        'version' : '<!(python <(version_py_path) -f ../chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
+        'revision' : '<!(python ../build/util/lastchange.py --revision-only)',
+        'packaging_files_common': [
+          'installer/linux/common/apt.include',
+          'installer/linux/common/default-app.template',
+          'installer/linux/common/default-app-block.template',
+          'installer/linux/common/desktop.template',
+          'installer/linux/common/google-chrome/google-chrome.info',
+          'installer/linux/common/installer.include',
+          'installer/linux/common/postinst.include',
+          'installer/linux/common/prerm.include',
+          'installer/linux/common/repo.cron',
+          'installer/linux/common/rpm.include',
+          'installer/linux/common/rpmrepo.cron',
+          'installer/linux/common/symlinks.include',
+          'installer/linux/common/updater',
+          'installer/linux/common/variables.include',
+          'installer/linux/common/wrapper',
+        ],
+        'packaging_files_deb': [
+          'installer/linux/debian/build.sh',
+          'installer/linux/debian/changelog.template',
+          'installer/linux/debian/control.template',
+          'installer/linux/debian/debian.menu',
+          'installer/linux/debian/expected_deps',
+          'installer/linux/debian/postinst',
+          'installer/linux/debian/postrm',
+          'installer/linux/debian/prerm',
+        ],
+        'packaging_files_rpm': [
+          'installer/linux/rpm/build.sh',
+          'installer/linux/rpm/chrome.spec.template',
+          'installer/linux/rpm/expected_deps_i386',
+          'installer/linux/rpm/expected_deps_x86_64',
+        ],
+        'packaging_files_binaries': [
+          # TODO(mmoss) Any convenient way to get all the relevant build
+          # files? (e.g. all locales, resources, etc.)
+          '<(PRODUCT_DIR)/chrome',
+          '<(PRODUCT_DIR)/chrome.pak',
+          '<(PRODUCT_DIR)/chrome_sandbox',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
+          '<(PRODUCT_DIR)/xdg-mime',
+          '<(PRODUCT_DIR)/xdg-settings',
+          '<(PRODUCT_DIR)/locales/en-US.pak',
+          '<(PRODUCT_DIR)/nacl_helper',
+          '<(PRODUCT_DIR)/nacl_helper_bootstrap',
+          '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
+          '<(PRODUCT_DIR)/PepperFlash/manifest.json',
+          '<@(default_apps_list_linux_dest)',
+        ],
+        'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
+        'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh',
+        'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh',
+        'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)',
+                    '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
+        'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
+                    '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
+        'conditions': [
+          ['target_arch=="ia32"', {
+            'deb_arch': 'i386',
+            'rpm_arch': 'i386',
+            'packaging_files_binaries': [
+              '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+              '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
+              '<(PRODUCT_DIR)/libwidevinecdm.so',
+            ],
+          }],
+          ['target_arch=="x64"', {
+            'deb_arch': 'amd64',
+            'rpm_arch': 'x86_64',
+            'packaging_files_binaries': [
+              '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+              '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
+              '<(PRODUCT_DIR)/libwidevinecdm.so',
+            ],
+          }],
+          ['target_arch=="arm"', {
+            'deb_arch': 'arm',
+            'rpm_arch': 'arm',
+          }],
+          ['internal_pdf', {
+            'packaging_files_binaries': [
+              '<(PRODUCT_DIR)/libpdf.so',
+            ],
+          }],
+          ['libpeer_target_type!="static_library"', {
+            'packaging_files_binaries': [
+              '<(PRODUCT_DIR)/lib/libpeerconnection.so',
+            ],
+          }],
+        ],
+      },
+      'targets': [
+        {
+          'target_name': 'linux_installer_configs',
+          'type': 'none',
+          # Add these files to the build output so the build archives will be
+          # "hermetic" for packaging. This is only for branding="Chrome" since
+          # we only create packages for official builds.
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/installer/debian/',
+              'files': [
+                '<@(packaging_files_deb)',
+              ]
+            },
+            {
+              'destination': '<(PRODUCT_DIR)/installer/rpm/',
+              'files': [
+                '<@(packaging_files_rpm)',
+              ]
+            },
+            {
+              'destination': '<(PRODUCT_DIR)/installer/common/',
+              'files': [
+                '<@(packaging_files_common)',
+              ]
+            },
+            # Additional theme resources needed for package building.
+            {
+              'destination': '<(PRODUCT_DIR)/installer/theme/',
+              'files': [
+                '<(branding_dir_100)/product_logo_16.png',
+                '<(branding_dir)/product_logo_22.png',
+                '<(branding_dir)/product_logo_24.png',
+                '<(branding_dir_100)/product_logo_32.png',
+                '<(branding_dir)/product_logo_48.png',
+                '<(branding_dir)/product_logo_64.png',
+                '<(branding_dir)/product_logo_128.png',
+                '<(branding_dir)/product_logo_256.png',
+                '<(branding_dir)/product_logo_32.xpm',
+                '<(branding_dir)/BRANDING',
+              ],
+            },
+          ],
+          'actions': [
+            {
+              'action_name': 'save_build_info',
+              'inputs': [
+                '<(branding_dir)/BRANDING',
+                '<(version_path)',
+                '<(lastchange_path)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/installer/version.txt',
+              ],
+              # Just output the default version info variables.
+              'action': [
+                'python', '<(version_py_path)',
+                '-f', '<(branding_dir)/BRANDING',
+                '-f', '<(version_path)',
+                '-f', '<(lastchange_path)',
+                '-o', '<@(_outputs)'
+              ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_all',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'linux_packages_unstable',
+            'linux_packages_beta',
+            'linux_packages_stable',
+          ],
+        },
+        {
+          # 'asan' is a developer, testing-only package, so it shouldn't be
+          # included in the 'linux_packages_all' collection.
+          'target_name': 'linux_packages_asan',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'linux_packages_asan_deb',
+          ],
+          # ChromeOS doesn't care about RPM packages.
+          'conditions': [
+            ['chromeos==0', {
+              'dependencies': [
+                'linux_packages_asan_rpm',
+              ],
+            }],
+          ],
+        },
+        {
+          # 'trunk' is a developer, testing-only package, so it shouldn't be
+          # included in the 'linux_packages_all' collection.
+          'target_name': 'linux_packages_trunk',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'linux_packages_trunk_deb',
+          ],
+          # ChromeOS doesn't care about RPM packages.
+          'conditions': [
+            ['chromeos==0', {
+              'dependencies': [
+                'linux_packages_trunk_rpm',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'linux_packages_unstable',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'linux_packages_unstable_deb',
+          ],
+          # ChromeOS doesn't care about RPM packages.
+          'conditions': [
+            ['chromeos==0', {
+              'dependencies': [
+                'linux_packages_unstable_rpm',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'linux_packages_beta',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'linux_packages_beta_deb',
+          ],
+          # ChromeOS doesn't care about RPM packages.
+          'conditions': [
+            ['chromeos==0', {
+              'dependencies': [
+                'linux_packages_beta_rpm',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'linux_packages_stable',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'linux_packages_stable_deb',
+          ],
+          # ChromeOS doesn't care about RPM packages.
+          'conditions': [
+            ['chromeos==0', {
+              'dependencies': [
+                'linux_packages_stable_rpm',
+              ],
+            }],
+          ],
+        },
+        # TODO(mmoss) gyp looping construct would be handy here ...
+        # These package actions are the same except for the 'channel' variable.
+        {
+          'target_name': 'linux_packages_asan_deb',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'asan',
+              },
+              'action_name': 'deb_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(deb_build)',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_deb)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-1_<(deb_arch).deb',
+              ],
+              'action': [ '<@(deb_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_trunk_deb',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'trunk',
+              },
+              'action_name': 'deb_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(deb_build)',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_deb)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-1_<(deb_arch).deb',
+              ],
+              'action': [ '<@(deb_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_unstable_deb',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'unstable',
+              },
+              'action_name': 'deb_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(deb_build)',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_deb)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-1_<(deb_arch).deb',
+              ],
+              'action': [ '<@(deb_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_beta_deb',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'beta',
+              },
+              'action_name': 'deb_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(deb_build)',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_deb)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-1_<(deb_arch).deb',
+              ],
+              'action': [ '<@(deb_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_stable_deb',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'stable',
+              },
+              'action_name': 'deb_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(deb_build)',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_deb)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-1_<(deb_arch).deb',
+              ],
+              'action': [ '<@(deb_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_asan_rpm',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'asan',
+              },
+              'action_name': 'rpm_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(rpm_build)',
+                '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_rpm)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)-<(version)-1.<(rpm_arch).rpm',
+              ],
+              'action': [ '<@(rpm_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_trunk_rpm',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'trunk',
+              },
+              'action_name': 'rpm_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(rpm_build)',
+                '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_rpm)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)-<(version)-1.<(rpm_arch).rpm',
+              ],
+              'action': [ '<@(rpm_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_unstable_rpm',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'unstable',
+              },
+              'action_name': 'rpm_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(rpm_build)',
+                '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_rpm)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)-<(version)-1.<(rpm_arch).rpm',
+              ],
+              'action': [ '<@(rpm_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_beta_rpm',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'beta',
+              },
+              'action_name': 'rpm_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(rpm_build)',
+                '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_rpm)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)-<(version)-1.<(rpm_arch).rpm',
+              ],
+              'action': [ '<@(rpm_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+        {
+          'target_name': 'linux_packages_stable_rpm',
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'chrome',
+            'linux_installer_configs',
+          ],
+          'actions': [
+            {
+              'variables': {
+                'channel': 'stable',
+              },
+              'action_name': 'rpm_packages_<(channel)',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                '<(rpm_build)',
+                '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
+                '<@(packaging_files_binaries)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_rpm)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/google-chrome-<(channel)-<(version)-1.<(rpm_arch).rpm',
+              ],
+              'action': [ '<@(rpm_cmd)', '-c', '<(channel)', ],
+            },
+          ],
+        },
+      ],
+    }],
+    ['OS=="mac"', {
+      'variables': {
+        'mac_packaging_dir':
+            '<(PRODUCT_DIR)/<(mac_product_name) Packaging',
+        # <(PRODUCT_DIR) expands to $(BUILT_PRODUCTS_DIR), which doesn't
+        # work properly in a shell script, where ${BUILT_PRODUCTS_DIR} is
+        # needed.
+        'mac_packaging_sh_dir':
+            '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Packaging',
+      }, # variables
+      'targets': [
+        {
+          'target_name': 'installer_packaging',
+          'type': 'none',
+          'dependencies': [
+            'installer/mac/third_party/bsdiff/goobsdiff.gyp:*',
+            'installer/mac/third_party/xz/xz.gyp:*',
+          ],
+          'conditions': [
+            ['buildtype=="Official"', {
+              'actions': [
+                {
+                  # Create sign.sh, the script that the packaging system will
+                  # use to sign the .app bundle.
+                  'action_name': 'Make sign.sh',
+                  'variables': {
+                    'make_signers_sh_path': 'installer/mac/make_signers.sh',
+                  },
+                  'inputs': [
+                    '<(make_signers_sh_path)',
+                    'installer/mac/sign_app.sh.in',
+                    'installer/mac/sign_versioned_dir.sh.in',
+                    'installer/mac/app_resource_rules.plist.in',
+                    '<(version_path)',
+                  ],
+                  'outputs': [
+                    '<(mac_packaging_dir)/sign_app.sh',
+                    '<(mac_packaging_dir)/sign_versioned_dir.sh',
+                    '<(mac_packaging_dir)/app_resource_rules.plist',
+                  ],
+                  'action': [
+                    '<(make_signers_sh_path)',
+                    '<(mac_packaging_sh_dir)',
+                    '<(mac_product_name)',
+                    '<(version_full)',
+                  ],
+                },
+              ],  # actions
+            }],  # buildtype=="Official"
+            ['branding=="Chrome" and buildtype=="Official"', {
+              'actions': [
+                {
+                  # copy_keychain_reauthorize.sh explains why this isn't in a
+                  # 'copies' block, but briefly: this is a prebuilt signed
+                  # binary component that relies on a correct signature to
+                  # function properly, and a normal 'copies' block sadly makes
+                  # a trivial modification to the file such that its signature
+                  # is no longer valid.
+                  'action_name': 'Copy keychain_reauthorize',
+                  'variables': {
+                    'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_reauthorize.sh',
+                    'keychain_reauthorize_normal_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome',
+                    'keychain_reauthorize_canary_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome.canary',
+                    'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.keychain_reauthorize',
+                  },
+                  'inputs': [
+                    '<(keychain_reauthorize_path)',
+                    '<(keychain_reauthorize_normal_path)',
+                    '<(keychain_reauthorize_canary_path)',
+                  ],
+                  'outputs': [
+                    '<(keychain_reauthorize_output_dir)/com.google.Chrome',
+                    '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary',
+                  ],
+                  'action': [
+                    '<(keychain_reauthorize_path)',
+                    '<(keychain_reauthorize_output_dir)',
+                    '<(keychain_reauthorize_normal_path)',
+                    '<(keychain_reauthorize_canary_path)',
+                  ],
+                },
+              ],  # actions
+            }],  # branding=="Chrome" and buildtype=="Official"
+          ],  # conditions
+          'copies': [
+            {
+              # Put the files where the packaging system will find them. The
+              # packager will use these when building the "full installer"
+              # disk images and delta/differential update disk images.
+              'destination': '<(mac_packaging_dir)',
+              'files': [
+                '<(PRODUCT_DIR)/goobsdiff',
+                '<(PRODUCT_DIR)/goobspatch',
+                '<(PRODUCT_DIR)/liblzma_decompress.dylib',
+                '<(PRODUCT_DIR)/xz',
+                '<(PRODUCT_DIR)/xzdec',
+                'installer/mac/dirdiffer.sh',
+                'installer/mac/dirpatcher.sh',
+                'installer/mac/dmgdiffer.sh',
+                'installer/mac/pkg-dmg',
+              ],
+              'conditions': [
+                ['mac_keystone==1', {
+                  'files': [
+                    'installer/mac/keystone_install.sh',
+                  ],
+                }],  # mac_keystone
+                ['branding=="Chrome" and buildtype=="Official"', {
+                  'files': [
+                    'app/theme/google_chrome/app_canary.icns',
+                    'app/theme/google_chrome/document_canary.icns',
+                    'installer/mac/internal/chrome_canary_dmg_dsstore',
+                    'installer/mac/internal/chrome_canary_dmg_icon.icns',
+                    'installer/mac/internal/chrome_dmg_background.png',
+                    'installer/mac/internal/chrome_dmg_dsstore',
+                    'installer/mac/internal/chrome_dmg_icon.icns',
+                    'installer/mac/internal/generate_dmgs',
+                  ],
+                }],  # branding=="Chrome" and buildtype=="Official"
+              ],  # conditions
+            },
+          ],  # copies
+        },  # target: installer_packaging
+        {
+          'target_name': 'gcapi_lib',
+          'type': 'static_library',
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'installer/gcapi_mac/gcapi.h',
+            'installer/gcapi_mac/gcapi.mm',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+            ],
+          },
+          'xcode_settings': {
+            'ARCHS': [ 'i386', 'x86_64' ],
+            'MACOSX_DEPLOYMENT_TARGET': '10.4',
+            'GCC_ENABLE_OBJC_GC': 'supported',
+          },
+        },
+        {
+          'target_name': 'gcapi_example',
+          'type': 'executable',
+          'dependencies': [
+            'gcapi_lib',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'installer/gcapi_mac/gcapi_example_client.mm',
+          ],
+        },
+      ],  # targets
+    }],  # OS=="mac"
+    [ 'branding == "Chrome"', {
+      'variables': {
+         'branding_dir': 'app/theme/google_chrome',
+         'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
+      },
+    }, { # else branding!="Chrome"
+      'variables': {
+         'branding_dir': 'app/theme/chromium',
+         'branding_dir_100': 'app/theme/default_100_percent/chromium',
+      },
+    }],
+  ],
+}
diff --git a/chromium/chrome/chrome_installer_util.gypi b/chromium/chrome/chrome_installer_util.gypi
new file mode 100644
index 00000000000..1777308a0cd
--- /dev/null
+++ b/chromium/chrome/chrome_installer_util.gypi
@@ -0,0 +1,237 @@
+# Copyright (c) 2012 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.
+
+{
+  'target_defaults': {
+    'variables': {
+      'installer_util_target': 0,
+    },
+    'target_conditions': [
+      # This part is shared between the two versions of the target.
+      ['installer_util_target==1', {
+        'sources': [
+          'installer/util/app_command.cc',
+          'installer/util/app_command.h',
+          'installer/util/app_commands.cc',
+          'installer/util/app_commands.h',
+          'installer/util/auto_launch_util.cc',
+          'installer/util/auto_launch_util.h',
+          'installer/util/browser_distribution.cc',
+          'installer/util/browser_distribution.h',
+          'installer/util/callback_work_item.cc',
+          'installer/util/callback_work_item.h',
+          'installer/util/channel_info.cc',
+          'installer/util/channel_info.h',
+          'installer/util/chrome_app_host_distribution.cc',
+          'installer/util/chrome_app_host_distribution.h',
+          'installer/util/chrome_frame_distribution.cc',
+          'installer/util/chrome_frame_distribution.h',
+          'installer/util/chromium_binaries_distribution.cc',
+          'installer/util/chromium_binaries_distribution.h',
+          'installer/util/conditional_work_item_list.cc',
+          'installer/util/conditional_work_item_list.h',
+          'installer/util/copy_reg_key_work_item.cc',
+          'installer/util/copy_reg_key_work_item.h',
+          'installer/util/copy_tree_work_item.cc',
+          'installer/util/copy_tree_work_item.h',
+          'installer/util/create_dir_work_item.cc',
+          'installer/util/create_dir_work_item.h',
+          'installer/util/create_reg_key_work_item.cc',
+          'installer/util/create_reg_key_work_item.h',
+          'installer/util/delete_reg_key_work_item.cc',
+          'installer/util/delete_reg_key_work_item.h',
+          'installer/util/delete_reg_value_work_item.cc',
+          'installer/util/delete_reg_value_work_item.h',
+          'installer/util/delete_tree_work_item.cc',
+          'installer/util/delete_tree_work_item.h',
+          'installer/util/duplicate_tree_detector.cc',
+          'installer/util/duplicate_tree_detector.h',
+          'installer/util/google_chrome_binaries_distribution.cc',
+          'installer/util/google_chrome_binaries_distribution.h',
+          'installer/util/google_chrome_sxs_distribution.cc',
+          'installer/util/google_chrome_sxs_distribution.h',
+          'installer/util/google_update_constants.cc',
+          'installer/util/google_update_constants.h',
+          'installer/util/google_update_experiment_util.cc',
+          'installer/util/google_update_experiment_util.h',
+          'installer/util/google_update_settings.cc',
+          'installer/util/google_update_settings.h',
+          'installer/util/google_update_util.cc',
+          'installer/util/google_update_util.h',
+          'installer/util/helper.cc',
+          'installer/util/helper.h',
+          'installer/util/install_util.cc',
+          'installer/util/install_util.h',
+          'installer/util/installation_state.cc',
+          'installer/util/installation_state.h',
+          'installer/util/installer_state.cc',
+          'installer/util/installer_state.h',
+          'installer/util/l10n_string_util.cc',
+          'installer/util/l10n_string_util.h',
+          'installer/util/language_selector.cc',
+          'installer/util/language_selector.h',
+          'installer/util/master_preferences_constants.cc',
+          'installer/util/master_preferences_constants.h',
+          'installer/util/move_tree_work_item.cc',
+          'installer/util/move_tree_work_item.h',
+          'installer/util/registry_key_backup.cc',
+          'installer/util/registry_key_backup.h',
+          'installer/util/self_reg_work_item.cc',
+          'installer/util/self_reg_work_item.h',
+          'installer/util/set_reg_value_work_item.cc',
+          'installer/util/set_reg_value_work_item.h',
+          'installer/util/util_constants.cc',
+          'installer/util/util_constants.h',
+          'installer/util/wmi.cc',
+          'installer/util/wmi.h',
+          'installer/util/work_item.cc',
+          'installer/util/work_item.h',
+          'installer/util/work_item_list.cc',
+          'installer/util/work_item_list.h',
+        ],
+        'include_dirs': [
+          '<(DEPTH)',
+        ],
+      }],
+    ],
+  },
+  'conditions': [
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'installer_util',
+          'type': 'static_library',
+          'variables': {
+            'installer_util_target': 1,
+          },
+          'dependencies': [
+            'installer_util_strings',
+            '<(DEPTH)/base/base.gyp:base',
+            '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
+            '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
+            '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+            '<(DEPTH)/content/content.gyp:content_common',
+            '<(DEPTH)/courgette/courgette.gyp:courgette_lib',
+            '<(DEPTH)/crypto/crypto.gyp:crypto',
+            '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
+            '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+            '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
+          ],
+          'sources': [
+            'installer/util/chrome_app_host_operations.cc',
+            'installer/util/chrome_app_host_operations.h',
+            'installer/util/chrome_binaries_operations.cc',
+            'installer/util/chrome_binaries_operations.h',
+            'installer/util/chrome_browser_operations.cc',
+            'installer/util/chrome_browser_operations.h',
+            'installer/util/chrome_browser_sxs_operations.cc',
+            'installer/util/chrome_browser_sxs_operations.h',
+            'installer/util/chrome_frame_operations.cc',
+            'installer/util/chrome_frame_operations.h',
+            'installer/util/compat_checks.cc',
+            'installer/util/compat_checks.h',
+            'installer/util/delete_after_reboot_helper.cc',
+            'installer/util/delete_after_reboot_helper.h',
+            'installer/util/eula_util.cc',
+            'installer/util/eula_util.h',
+            'installer/util/google_chrome_distribution.cc',
+            'installer/util/google_chrome_distribution.h',
+            'installer/util/html_dialog.h',
+            'installer/util/html_dialog_impl.cc',
+            'installer/util/installation_validator.cc',
+            'installer/util/installation_validator.h',
+            'installer/util/logging_installer.cc',
+            'installer/util/logging_installer.h',
+            'installer/util/lzma_util.cc',
+            'installer/util/lzma_util.h',
+            'installer/util/master_preferences.cc',
+            'installer/util/master_preferences.h',
+            'installer/util/product.h',
+            'installer/util/product.cc',
+            'installer/util/product_operations.h',
+            'installer/util/self_cleaning_temp_dir.cc',
+            'installer/util/self_cleaning_temp_dir.h',
+            'installer/util/shell_util.cc',
+            'installer/util/shell_util.h',
+            'installer/util/uninstall_metrics.cc',
+            'installer/util/uninstall_metrics.h',
+            'installer/util/user_experiment.cc',
+            'installer/util/user_experiment.h',
+          ],
+          'conditions': [
+            ['component=="shared_library"', {
+              'sources': [ '../content/public/common/content_switches.cc' ],
+              'defines': [ 'COMPILE_CONTENT_STATICALLY'],
+            }, {
+              'dependencies': ['<(DEPTH)/content/content.gyp:content_common'],
+            }],
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        },
+      ],
+    }],
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
+          'target_name': 'installer_util_nacl_win64',
+          'type': 'static_library',
+          'variables': {
+            'installer_util_target': 1,
+          },
+          'dependencies': [
+            'installer_util_strings',
+          ],
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)',
+          ],
+          'sources': [
+            'installer/util/google_chrome_distribution_dummy.cc',
+            'installer/util/master_preferences.h',
+            'installer/util/master_preferences_dummy.cc',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+        },
+      ],
+    }],
+    ['OS!="win"', {
+      'targets': [
+        {
+          'target_name': 'installer_util',
+          'type': 'static_library',
+          'dependencies': [
+            '<(DEPTH)/base/base.gyp:base',
+            '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
+            '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
+            '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+          ],
+          'sources': [
+            'installer/util/google_update_experiment_util.cc',
+            'installer/util/google_update_experiment_util.h',
+            'installer/util/master_preferences.cc',
+            'installer/util/master_preferences.h',
+            'installer/util/master_preferences_constants.cc',
+            'installer/util/master_preferences_constants.h',
+          ],
+          'include_dirs': [
+            '<(DEPTH)',
+          ],
+          'conditions': [
+            ['component == "shared_library"', {
+              'sources': [ '../content/public/common/content_switches.cc' ],
+              'defines': [ 'COMPILE_CONTENT_STATICALLY'],
+            }],
+          ],
+        }
+      ],
+    }],
+
+  ],
+}
diff --git a/chromium/chrome/chrome_ios_bundle_resources.gypi b/chromium/chrome/chrome_ios_bundle_resources.gypi
new file mode 100644
index 00000000000..988654bb795
--- /dev/null
+++ b/chromium/chrome/chrome_ios_bundle_resources.gypi
@@ -0,0 +1,16 @@
+# Copyright (c) 2012 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.
+{
+  'dependencies': [
+    '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
+    '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
+  ],
+  'mac_bundle_resources': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
+    '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
+    '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
+  ],
+}
diff --git a/chromium/chrome/chrome_nibs.gyp b/chromium/chrome/chrome_nibs.gyp
new file mode 100644
index 00000000000..2e12fc63db8
--- /dev/null
+++ b/chromium/chrome/chrome_nibs.gyp
@@ -0,0 +1,268 @@
+# Copyright (c) 2012 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.
+
+# This gyp file creates a fake target that is used to generate a minimal Xcode
+# project, useful for editing XIB files.
+#
+# The sole target is called "chrome_nibs" and its sources are the minimum
+# dependency set for all of the classes referred to by XIB files. If you are
+# editing or adding a new XIB file, ensure that any classes to which you refer
+# in the XIB are listed (both header and implementation) here so that Xcode can
+# connect them.
+#
+# This target DOES NOT BUILD. Attempting to do so will generate lots of errors.
+# Only use this target for editing XIBs.
+#
+# For more information, see
+# <http://dev.chromium.org/developers/design-documents/mac-xib-files>.
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'includes': [
+    '../build/common.gypi',
+    'chrome_nibs.gypi',
+  ],
+  'target_defaults': {
+    'include_dirs': [
+      '..',
+    ],
+  },
+  'targets': [
+    {
+      'target_name': 'chrome_nibs',
+      'type': 'executable',
+      'mac_bundle': 1,
+      'sources': [
+        '../third_party/GTM/AppKit/GTMUILocalizer.h',
+        '../third_party/GTM/AppKit/GTMUILocalizer.mm',
+        '../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h',
+        '../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.mm',
+        '../ui/base/cocoa/base_view.h',
+        '../ui/base/cocoa/base_view.mm',
+        '../ui/base/cocoa/controls/hyperlink_button_cell.h',
+        '../ui/base/cocoa/controls/hyperlink_button_cell.mm',
+        '../ui/base/cocoa/hover_button.h',
+        '../ui/base/cocoa/hover_button.mm',
+        '../ui/base/cocoa/hover_image_button.h',
+        '../ui/base/cocoa/hover_image_button.mm',
+        '../ui/base/cocoa/menu_controller.h',
+        '../ui/base/cocoa/menu_controller.mm',
+        'browser/ui/cocoa/about_ipc_controller.h',
+        'browser/ui/cocoa/about_ipc_controller.mm',
+        'browser/ui/cocoa/animatable_view.h',
+        'browser/ui/cocoa/animatable_view.mm',
+        'browser/ui/cocoa/background_gradient_view.h',
+        'browser/ui/cocoa/background_gradient_view.mm',
+        'browser/ui/cocoa/base_bubble_controller.h',
+        'browser/ui/cocoa/base_bubble_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_view.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_view.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_button.h',
+        'browser/ui/cocoa/bookmarks/bookmark_button.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_button_cell.h',
+        'browser/ui/cocoa/bookmarks/bookmark_button_cell.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h',
+        'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm',
+        'browser/ui/cocoa/browser/avatar_menu_bubble_controller.h',
+        'browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm',
+        'browser/ui/cocoa/browser_window_controller.h',
+        'browser/ui/cocoa/browser_window_controller.mm',
+        'browser/ui/cocoa/browser_window_controller_private.h',
+        'browser/ui/cocoa/browser_window_controller_private.mm',
+        'browser/ui/cocoa/chrome_browser_window.h',
+        'browser/ui/cocoa/chrome_browser_window.mm',
+        'browser/ui/cocoa/chrome_event_processing_window.h',
+        'browser/ui/cocoa/chrome_event_processing_window.mm',
+        'browser/ui/cocoa/clickhold_button_cell.h',
+        'browser/ui/cocoa/clickhold_button_cell.mm',
+        'browser/ui/cocoa/content_settings/collected_cookies_mac.h',
+        'browser/ui/cocoa/content_settings/collected_cookies_mac.mm',
+        'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h',
+        'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm',
+        'browser/ui/cocoa/content_settings/cookie_details_view_controller.h',
+        'browser/ui/cocoa/content_settings/cookie_details_view_controller.mm',
+        'browser/ui/cocoa/custom_frame_view.h',
+        'browser/ui/cocoa/custom_frame_view.mm',
+        'browser/ui/cocoa/download/download_item_button.h',
+        'browser/ui/cocoa/download/download_item_button.mm',
+        'browser/ui/cocoa/download/download_item_cell.h',
+        'browser/ui/cocoa/download/download_item_cell.mm',
+        'browser/ui/cocoa/download/download_item_controller.h',
+        'browser/ui/cocoa/download/download_item_controller.mm',
+        'browser/ui/cocoa/download/download_shelf_controller.h',
+        'browser/ui/cocoa/download/download_shelf_controller.mm',
+        'browser/ui/cocoa/download/download_shelf_view.h',
+        'browser/ui/cocoa/download/download_shelf_view.mm',
+        'browser/ui/cocoa/download/download_show_all_button.h',
+        'browser/ui/cocoa/download/download_show_all_button.mm',
+        'browser/ui/cocoa/download/download_show_all_cell.h',
+        'browser/ui/cocoa/download/download_show_all_cell.mm',
+        'browser/ui/cocoa/draggable_button.h',
+        'browser/ui/cocoa/draggable_button.mm',
+        'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h',
+        'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_button.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_button.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_custom_window.h',
+        'browser/ui/cocoa/constrained_window/constrained_window_custom_window.mm',
+        'browser/ui/cocoa/extensions/browser_actions_container_view.h',
+        'browser/ui/cocoa/extensions/browser_actions_container_view.mm',
+        'browser/ui/cocoa/extensions/extension_install_dialog_controller.h',
+        'browser/ui/cocoa/extensions/extension_install_dialog_controller.mm',
+        'browser/ui/cocoa/extensions/extension_install_view_controller.h',
+        'browser/ui/cocoa/extensions/extension_install_view_controller.mm',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_controller.h',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm',
+        'browser/ui/cocoa/fast_resize_view.h',
+        'browser/ui/cocoa/fast_resize_view.mm',
+        'browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h',
+        'browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field.h',
+        'browser/ui/cocoa/find_bar/find_bar_text_field.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_cell.h',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm',
+        'browser/ui/cocoa/find_bar/find_bar_view.h',
+        'browser/ui/cocoa/find_bar/find_bar_view.mm',
+        'browser/ui/cocoa/first_run_bubble_controller.h',
+        'browser/ui/cocoa/first_run_bubble_controller.mm',
+        'browser/ui/cocoa/first_run_dialog.h',
+        'browser/ui/cocoa/first_run_dialog.mm',
+        'browser/ui/cocoa/framed_browser_window.h',
+        'browser/ui/cocoa/framed_browser_window.mm',
+        'browser/ui/cocoa/fullscreen_exit_bubble_controller.h',
+        'browser/ui/cocoa/fullscreen_exit_bubble_controller.mm',
+        'browser/ui/cocoa/fullscreen_exit_bubble_view.h',
+        'browser/ui/cocoa/fullscreen_exit_bubble_view.mm',
+        'browser/ui/cocoa/global_error_bubble_controller.h',
+        'browser/ui/cocoa/global_error_bubble_controller.mm',
+        'browser/ui/cocoa/gradient_button_cell.h',
+        'browser/ui/cocoa/gradient_button_cell.mm',
+        'browser/ui/cocoa/hover_close_button.h',
+        'browser/ui/cocoa/hover_close_button.mm',
+        'browser/ui/cocoa/hung_renderer_controller.h',
+        'browser/ui/cocoa/hung_renderer_controller.mm',
+        'browser/ui/cocoa/image_button_cell.h',
+        'browser/ui/cocoa/image_button_cell.mm',
+        'browser/ui/cocoa/info_bubble_view.h',
+        'browser/ui/cocoa/info_bubble_view.mm',
+        'browser/ui/cocoa/info_bubble_window.h',
+        'browser/ui/cocoa/info_bubble_window.mm',
+        'browser/ui/cocoa/infobars/after_translate_infobar_controller.h',
+        'browser/ui/cocoa/infobars/after_translate_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/alternate_nav_infobar_controller.h',
+        'browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/before_translate_infobar_controller.h',
+        'browser/ui/cocoa/infobars/before_translate_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/confirm_infobar_controller.h',
+        'browser/ui/cocoa/infobars/confirm_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/extension_infobar_controller.h',
+        'browser/ui/cocoa/infobars/extension_infobar_controller.mm',
+        'browser/ui/cocoa/infobars/infobar_container_controller.h',
+        'browser/ui/cocoa/infobars/infobar_container_controller.mm',
+        'browser/ui/cocoa/infobars/infobar_controller.h',
+        'browser/ui/cocoa/infobars/infobar_controller.mm',
+        'browser/ui/cocoa/infobars/infobar_gradient_view.h',
+        'browser/ui/cocoa/infobars/infobar_gradient_view.mm',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field.h',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field.mm',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm',
+        'browser/ui/cocoa/login_prompt_cocoa.h',
+        'browser/ui/cocoa/login_prompt_cocoa.mm',
+        'browser/ui/cocoa/menu_button.h',
+        'browser/ui/cocoa/menu_button.mm',
+        'browser/ui/cocoa/multi_key_equivalent_button.h',
+        'browser/ui/cocoa/multi_key_equivalent_button.mm',
+        'browser/ui/cocoa/new_tab_button.h',
+        'browser/ui/cocoa/new_tab_button.mm',
+        'browser/ui/cocoa/notifications/balloon_controller.h',
+        'browser/ui/cocoa/notifications/balloon_controller.mm',
+        'browser/ui/cocoa/notifications/balloon_view.h',
+        'browser/ui/cocoa/notifications/balloon_view.mm',
+        'browser/ui/cocoa/nsmenuitem_additions.h',
+        'browser/ui/cocoa/nsmenuitem_additions.mm',
+        'browser/ui/cocoa/nsview_additions.h',
+        'browser/ui/cocoa/nsview_additions.mm',
+        'browser/ui/cocoa/one_click_signin_view_controller.h',
+        'browser/ui/cocoa/one_click_signin_view_controller.mm',
+        'browser/ui/cocoa/screen_capture_notification_ui_cocoa.h',
+        'browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm',
+        'browser/ui/cocoa/speech_recognition_window_controller.h',
+        'browser/ui/cocoa/speech_recognition_window_controller.mm',
+        'browser/ui/cocoa/status_bubble_mac.h',
+        'browser/ui/cocoa/status_bubble_mac.mm',
+        'browser/ui/cocoa/styled_text_field.h',
+        'browser/ui/cocoa/styled_text_field.mm',
+        'browser/ui/cocoa/styled_text_field_cell.h',
+        'browser/ui/cocoa/styled_text_field_cell.mm',
+        'browser/ui/cocoa/tab_contents/overlayable_contents_controller.h',
+        'browser/ui/cocoa/tab_contents/overlayable_contents_controller.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_controller.h',
+        'browser/ui/cocoa/tab_contents/sad_tab_controller.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_view.h',
+        'browser/ui/cocoa/tab_contents/sad_tab_view.mm',
+        'browser/ui/cocoa/tabs/tab_controller.h',
+        'browser/ui/cocoa/tabs/tab_controller.mm',
+        'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h',
+        'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.mm',
+        'browser/ui/cocoa/tabs/tab_strip_view.h',
+        'browser/ui/cocoa/tabs/tab_strip_view.mm',
+        'browser/ui/cocoa/tabs/tab_view.h',
+        'browser/ui/cocoa/tabs/tab_view.mm',
+        'browser/ui/cocoa/tabs/tab_window_controller.h',
+        'browser/ui/cocoa/tabs/tab_window_controller.mm',
+        'browser/ui/cocoa/task_manager_mac.h',
+        'browser/ui/cocoa/task_manager_mac.mm',
+        'browser/ui/cocoa/themed_window.h',
+        'browser/ui/cocoa/themed_window.mm',
+        'browser/ui/cocoa/toolbar/reload_button.h',
+        'browser/ui/cocoa/toolbar/reload_button.mm',
+        'browser/ui/cocoa/toolbar/toolbar_button.h',
+        'browser/ui/cocoa/toolbar/toolbar_button.mm',
+        'browser/ui/cocoa/toolbar/toolbar_controller.h',
+        'browser/ui/cocoa/toolbar/toolbar_controller.mm',
+        'browser/ui/cocoa/toolbar/toolbar_view.h',
+        'browser/ui/cocoa/toolbar/toolbar_view.mm',
+        'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h',
+        'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm',
+        'browser/ui/cocoa/ui_localizer.h',
+        'browser/ui/cocoa/ui_localizer.mm',
+        'browser/ui/cocoa/vertical_gradient_view.h',
+        'browser/ui/cocoa/vertical_gradient_view.mm',
+        'browser/ui/cocoa/view_id_util.h',
+        'browser/ui/cocoa/view_id_util.mm',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_controller.h',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm',
+        'browser/ui/cocoa/panels/panel_titlebar_view_cocoa.h',
+        'browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm',
+        'browser/ui/cocoa/panels/panel_window_controller_cocoa.h',
+        'browser/ui/cocoa/panels/panel_window_controller_cocoa.mm',
+      ],
+      'mac_bundle_resources': [
+        '<@(mac_all_xibs)',
+      ],
+    },  # target chrome_xibs
+  ],  # targets
+}
diff --git a/chromium/chrome/chrome_nibs.gypi b/chromium/chrome/chrome_nibs.gypi
new file mode 100644
index 00000000000..7c7aa330ad9
--- /dev/null
+++ b/chromium/chrome/chrome_nibs.gypi
@@ -0,0 +1,73 @@
+# Copyright (c) 2012 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.
+
+# This gypi file contains lists of XIB files that are used by Chromium. The
+# lists are divided by those files that need to be run through the localizer
+# tool and those that do not. A XIB should be listed in either one or the
+# other, but not both.
+{
+  'variables': {
+    'mac_translated_xibs': [
+      'app/nibs/AvatarMenuItem.xib',
+      'app/nibs/BookmarkAllTabs.xib',
+      'app/nibs/BookmarkBar.xib',
+      'app/nibs/BookmarkBubble.xib',
+      'app/nibs/BookmarkEditor.xib',
+      'app/nibs/BookmarkNameFolder.xib',
+      'app/nibs/CollectedCookies.xib',
+      'app/nibs/ContentBlockedCookies.xib',
+      'app/nibs/ContentBlockedDownloads.xib',
+      'app/nibs/ContentBlockedMIDISysEx.xib',
+      'app/nibs/ContentBlockedMedia.xib',
+      'app/nibs/ContentBlockedMixedScript.xib',
+      'app/nibs/ContentBlockedPlugins.xib',
+      'app/nibs/ContentBlockedPopups.xib',
+      'app/nibs/ContentBlockedGeolocation.xib',
+      'app/nibs/ContentBlockedSimple.xib',
+      'app/nibs/ContentProtocolHandlers.xib',
+      'app/nibs/CookieDetailsView.xib',
+      'app/nibs/DownloadItem.xib',
+      'app/nibs/DownloadShelf.xib',
+      'app/nibs/EditSearchEngine.xib',
+      'app/nibs/ExtensionInstallPrompt.xib',
+      'app/nibs/ExtensionInstallPromptBundle.xib',
+      'app/nibs/ExtensionInstallPromptInline.xib',
+      'app/nibs/ExtensionInstallPromptNoWarnings.xib',
+      'app/nibs/ExtensionInstalledBubble.xib',
+      'app/nibs/FirstRunBubble.xib',
+      'app/nibs/FirstRunDialog.xib',
+      'app/nibs/FullscreenExitBubble.xib',
+      'app/nibs/HttpAuthLoginSheet.xib',
+      'app/nibs/HungRendererDialog.xib',
+      'app/nibs/ImportProgressDialog.xib',
+      'app/nibs/MainMenu.xib',
+      'app/nibs/OneClickSigninBubble.xib',
+      'app/nibs/OneClickSigninDialog.xib',
+      'app/nibs/SadTab.xib',
+      'app/nibs/SaveAccessoryView.xib',
+      'app/nibs/SpeechRecognitionBubble.xib',
+      'app/nibs/TaskManager.xib',
+      'app/nibs/Toolbar.xib',
+      'app/nibs/WrenchMenu.xib',
+    ],  # mac_translated_xibs
+    'mac_untranslated_xibs': [
+      'app/nibs/AboutIPC.xib',
+      'app/nibs/ActionBoxMenuItem.xib',
+      'app/nibs/BookmarkBarFolderWindow.xib',
+      'app/nibs/ExtensionInstalledBubbleBundle.xib',
+      'app/nibs/FindBar.xib',
+      'app/nibs/GlobalErrorBubble.xib',
+      'app/nibs/HungRendererDialog.xib',
+      'app/nibs/InfoBar.xib',
+      'app/nibs/InfoBarContainer.xib',
+      'app/nibs/Notification.xib',
+      'app/nibs/Panel.xib',
+      'app/nibs/ScreenCaptureNotification.xib',
+    ],  # mac_untranslated_xibs
+    'mac_all_xibs': [
+      '<@(mac_translated_xibs)',
+      '<@(mac_untranslated_xibs)',
+    ],  # mac_all_xibs
+  },  # variables
+}
diff --git a/chromium/chrome/chrome_process_finder.gypi b/chromium/chrome/chrome_process_finder.gypi
new file mode 100644
index 00000000000..0193b3baf1b
--- /dev/null
+++ b/chromium/chrome/chrome_process_finder.gypi
@@ -0,0 +1,25 @@
+# Copyright (c) 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'chrome_process_finder',
+      'type': 'static_library',
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        'policy_path_parser',
+        '../base/base.gyp:base',
+        '../chrome/chrome.gyp:metro_utils',
+        '../chrome/common_constants.gyp:common_constants',
+      ],
+      'sources': [
+        'browser/chrome_process_finder_win.cc',
+        'browser/chrome_process_finder_win.h',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/chrome_renderer.gypi b/chromium/chrome/chrome_renderer.gypi
new file mode 100644
index 00000000000..5b0d88cdd73
--- /dev/null
+++ b/chromium/chrome/chrome_renderer.gypi
@@ -0,0 +1,433 @@
+# Copyright (c) 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'renderer',
+      'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'dependencies': [
+        'common',
+        'common_net',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        '../components/components.gyp:autofill_content_renderer',
+        '../components/components.gyp:visitedlink_renderer',
+        '../content/content.gyp:content_renderer',
+        '../net/net.gyp:net',
+        '../printing/printing.gyp:printing',
+        '../skia/skia.gyp:skia',
+        '../third_party/WebKit/public/blink.gyp:blink',
+        '../third_party/hunspell/hunspell.gyp:hunspell',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/npapi/npapi.gyp:npapi',
+        '../third_party/re2/re2.gyp:re2',
+        '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+        '../ui/surface/surface.gyp:surface',
+        '../webkit/common/webkit_common.gyp:webkit_common',
+        '../webkit/support/webkit_support.gyp:glue_child',
+        '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
+        '../webkit/support/webkit_support.gyp:glue',
+        '../webkit/webkit_resources.gyp:webkit_resources',
+      ],
+      'include_dirs': [
+        '..',
+        # Needed by chrome_content_renderer_client.cc.
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
+      'defines': [
+        '<@(nacl_defines)',
+      ],
+      'direct_dependent_settings': {
+        'defines': [
+          '<@(nacl_defines)',
+        ],
+      },
+      'sources': [
+        'renderer/benchmarking_extension.cc',
+        'renderer/benchmarking_extension.h',
+        'renderer/extensions/activity_log_converter_strategy.cc',
+        'renderer/extensions/activity_log_converter_strategy.h',
+        'renderer/extensions/api_activity_logger.cc',
+        'renderer/extensions/api_activity_logger.h',
+        'renderer/extensions/api_definitions_natives.cc',
+        'renderer/extensions/api_definitions_natives.h',
+        'renderer/extensions/app_bindings.cc',
+        'renderer/extensions/app_bindings.h',
+        'renderer/extensions/app_runtime_custom_bindings.cc',
+        'renderer/extensions/app_runtime_custom_bindings.h',
+        'renderer/extensions/app_window_custom_bindings.cc',
+        'renderer/extensions/app_window_custom_bindings.h',
+        'renderer/extensions/binding_generating_native_handler.cc',
+        'renderer/extensions/binding_generating_native_handler.h',
+        'renderer/extensions/chrome_v8_context.cc',
+        'renderer/extensions/chrome_v8_context.h',
+        'renderer/extensions/chrome_v8_context_set.cc',
+        'renderer/extensions/chrome_v8_context_set.h',
+        'renderer/extensions/chrome_v8_extension.cc',
+        'renderer/extensions/chrome_v8_extension.h',
+        'renderer/extensions/chrome_v8_extension_handler.cc',
+        'renderer/extensions/chrome_v8_extension_handler.h',
+        'renderer/extensions/console.cc',
+        'renderer/extensions/console.h',
+        'renderer/extensions/content_watcher.cc',
+        'renderer/extensions/content_watcher.h',
+        'renderer/extensions/context_menus_custom_bindings.cc',
+        'renderer/extensions/context_menus_custom_bindings.h',
+        'renderer/extensions/dispatcher.cc',
+        'renderer/extensions/dispatcher.h',
+        'renderer/extensions/dom_activity_logger.cc',
+        'renderer/extensions/dom_activity_logger.h',
+        'renderer/extensions/event_bindings.cc',
+        'renderer/extensions/event_bindings.h',
+        'renderer/extensions/extension_custom_bindings.cc',
+        'renderer/extensions/extension_custom_bindings.h',
+        'renderer/extensions/extension_groups.h',
+        'renderer/extensions/extension_helper.cc',
+        'renderer/extensions/extension_helper.h',
+        'renderer/extensions/extension_localization_peer.cc',
+        'renderer/extensions/extension_localization_peer.h',
+        'renderer/extensions/feedback_private_custom_bindings.cc',
+        'renderer/extensions/feedback_private_custom_bindings.h',
+        'renderer/extensions/file_browser_handler_custom_bindings.cc',
+        'renderer/extensions/file_browser_handler_custom_bindings.h',
+        'renderer/extensions/file_browser_private_custom_bindings.cc',
+        'renderer/extensions/file_browser_private_custom_bindings.h',
+        'renderer/extensions/file_system_natives.cc',
+        'renderer/extensions/file_system_natives.h',
+        'renderer/extensions/i18n_custom_bindings.cc',
+        'renderer/extensions/i18n_custom_bindings.h',
+        'renderer/extensions/logging_native_handler.cc',
+        'renderer/extensions/logging_native_handler.h',
+        'renderer/extensions/media_galleries_custom_bindings.cc',
+        'renderer/extensions/media_galleries_custom_bindings.h',
+        'renderer/extensions/messaging_bindings.cc',
+        'renderer/extensions/messaging_bindings.h',
+        'renderer/extensions/module_system.cc',
+        'renderer/extensions/module_system.h',
+        'renderer/extensions/native_handler.cc',
+        'renderer/extensions/native_handler.h',
+        'renderer/extensions/object_backed_native_handler.cc',
+        'renderer/extensions/object_backed_native_handler.h',
+        'renderer/extensions/page_actions_custom_bindings.cc',
+        'renderer/extensions/page_actions_custom_bindings.h',
+        'renderer/extensions/page_capture_custom_bindings.cc',
+        'renderer/extensions/page_capture_custom_bindings.h',
+        'renderer/extensions/renderer_permissions_policy_delegate.cc',
+        'renderer/extensions/renderer_permissions_policy_delegate.h',
+        'renderer/extensions/render_view_observer_natives.cc',
+        'renderer/extensions/render_view_observer_natives.h',
+        'renderer/extensions/request_sender.cc',
+        'renderer/extensions/request_sender.h',
+        'renderer/extensions/resource_request_policy.cc',
+        'renderer/extensions/resource_request_policy.h',
+        'renderer/extensions/runtime_custom_bindings.cc',
+        'renderer/extensions/runtime_custom_bindings.h',
+        'renderer/extensions/safe_builtins.cc',
+        'renderer/extensions/safe_builtins.h',
+        'renderer/extensions/scoped_persistent.h',
+        'renderer/extensions/send_request_natives.cc',
+        'renderer/extensions/send_request_natives.h',
+        'renderer/extensions/set_icon_natives.cc',
+        'renderer/extensions/set_icon_natives.h',
+        'renderer/extensions/sync_file_system_custom_bindings.cc',
+        'renderer/extensions/sync_file_system_custom_bindings.h',
+        'renderer/extensions/tab_finder.cc',
+        'renderer/extensions/tab_finder.h',
+        'renderer/extensions/tabs_custom_bindings.cc',
+        'renderer/extensions/tabs_custom_bindings.h',
+        'renderer/extensions/tts_custom_bindings.cc',
+        'renderer/extensions/tts_custom_bindings.h',
+        'renderer/extensions/unsafe_persistent.h',
+        'renderer/extensions/user_script_scheduler.cc',
+        'renderer/extensions/user_script_scheduler.h',
+        'renderer/extensions/user_script_slave.cc',
+        'renderer/extensions/user_script_slave.h',
+        'renderer/extensions/v8_schema_registry.cc',
+        'renderer/extensions/v8_schema_registry.h',
+        'renderer/extensions/web_request_custom_bindings.cc',
+        'renderer/extensions/web_request_custom_bindings.h',
+        'renderer/extensions/webstore_bindings.cc',
+        'renderer/extensions/webstore_bindings.h',
+        'renderer/frame_sniffer.cc',
+        'renderer/frame_sniffer.h',
+        'renderer/isolated_world_ids.h',
+        'renderer/loadtimes_extension_bindings.cc',
+        'renderer/loadtimes_extension_bindings.h',
+        'renderer/media/chrome_webrtc_log_message_delegate.cc',
+        'renderer/media/chrome_webrtc_log_message_delegate.h',
+        'renderer/media/webrtc_logging_message_filter.cc',
+        'renderer/media/webrtc_logging_message_filter.h',
+        'renderer/net/net_error_helper.cc',
+        'renderer/net/net_error_helper.h',
+        'renderer/net/predictor_queue.cc',
+        'renderer/net/predictor_queue.h',
+        'renderer/net/prescient_networking_dispatcher.cc',
+        'renderer/net/prescient_networking_dispatcher.h',
+        'renderer/net/renderer_net_predictor.cc',
+        'renderer/net/renderer_net_predictor.h',
+        'renderer/net_benchmarking_extension.cc',
+        'renderer/net_benchmarking_extension.h',
+        'renderer/one_click_signin_agent.cc',
+        'renderer/one_click_signin_agent.h',
+        'renderer/playback_extension.cc',
+        'renderer/playback_extension.h',
+        'renderer/resource_bundle_source_map.cc',
+        'renderer/resource_bundle_source_map.h',
+        'renderer/resources/extensions/app_custom_bindings.js',
+        'renderer/resources/extensions/app_window_custom_bindings.js',
+        'renderer/resources/extensions/binding.js',
+        'renderer/resources/extensions/browser_action_custom_bindings.js',
+        'renderer/resources/extensions/chrome_direct_setting.js',
+        'renderer/resources/extensions/chrome_setting.js',
+        'renderer/resources/extensions/content_setting.js',
+        'renderer/resources/extensions/content_watcher.js',
+        'renderer/resources/extensions/context_menus_custom_bindings.js',
+        'renderer/resources/extensions/declarative_content_custom_bindings.js',
+        'renderer/resources/extensions/declarative_webrequest_custom_bindings.js',
+        'renderer/resources/extensions/event.js',
+        'renderer/resources/extensions/experimental.offscreenTabs_custom_bindings.js',
+        'renderer/resources/extensions/extension_custom_bindings.js',
+        'renderer/resources/extensions/feedback_private_custom_bindings.js',
+        'renderer/resources/extensions/file_browser_handler_custom_bindings.js',
+        'renderer/resources/extensions/file_browser_private_custom_bindings.js',
+        'renderer/resources/extensions/file_system_custom_bindings.js',
+        'renderer/resources/extensions/greasemonkey_api.js',
+        'renderer/resources/extensions/input.ime_custom_bindings.js',
+        'renderer/resources/extensions/json_schema.js',
+        'renderer/resources/extensions/last_error.js',
+        'renderer/resources/extensions/messaging.js',
+        'renderer/resources/extensions/notifications_custom_bindings.js',
+        'renderer/resources/extensions/omnibox_custom_bindings.js',
+        'renderer/resources/extensions/page_action_custom_bindings.js',
+        'renderer/resources/extensions/page_actions_custom_bindings.js',
+        'renderer/resources/extensions/page_capture_custom_bindings.js',
+        'renderer/resources/extensions/platform_app.js',
+        'renderer/resources/extensions/runtime_custom_bindings.js',
+        'renderer/resources/extensions/send_request.js',
+        'renderer/resources/extensions/set_icon.js',
+        'renderer/resources/extensions/storage_area.js',
+        'renderer/resources/extensions/system_indicator_custom_bindings.js',
+        'renderer/resources/extensions/test_custom_bindings.js',
+        'renderer/resources/extensions/tts_custom_bindings.js',
+        'renderer/resources/extensions/tts_engine_custom_bindings.js',
+        'renderer/resources/extensions/unload_event.js',
+        'renderer/resources/extensions/utils.js',
+        'renderer/resources/extensions/web_request_custom_bindings.js',
+        'renderer/resources/extensions/web_view.js',
+        'renderer/resources/extensions/web_view_experimental.js',
+        'renderer/chrome_content_renderer_client.cc',
+        'renderer/chrome_content_renderer_client.h',
+        'renderer/chrome_render_process_observer.cc',
+        'renderer/chrome_render_process_observer.h',
+        'renderer/chrome_render_view_observer.cc',
+        'renderer/chrome_render_view_observer.h',
+        'renderer/content_settings_observer.cc',
+        'renderer/content_settings_observer.h',
+        'renderer/custom_menu_commands.h',
+        'renderer/external_host_bindings.cc',
+        'renderer/external_host_bindings.h',
+        'renderer/external_extension.cc',
+        'renderer/external_extension.h',
+        'renderer/page_load_histograms.cc',
+        'renderer/page_load_histograms.h',
+        'renderer/pepper/chrome_renderer_pepper_host_factory.cc',
+        'renderer/pepper/chrome_renderer_pepper_host_factory.h',
+        'renderer/pepper/pepper_extensions_common_host.cc',
+        'renderer/pepper/pepper_extensions_common_host.h',
+        'renderer/pepper/pepper_flash_drm_renderer_host.cc',
+        'renderer/pepper/pepper_flash_drm_renderer_host.h',
+        'renderer/pepper/pepper_flash_font_file_host.cc',
+        'renderer/pepper/pepper_flash_font_file_host.h',
+        'renderer/pepper/pepper_flash_fullscreen_host.cc',
+        'renderer/pepper/pepper_flash_fullscreen_host.h',
+        'renderer/pepper/pepper_flash_menu_host.cc',
+        'renderer/pepper/pepper_flash_menu_host.h',
+        'renderer/pepper/pepper_flash_renderer_host.cc',
+        'renderer/pepper/pepper_flash_renderer_host.h',
+        'renderer/pepper/pepper_helper.cc',
+        'renderer/pepper/pepper_helper.h',
+        'renderer/pepper/pepper_pdf_host.cc',
+        'renderer/pepper/pepper_pdf_host.h',
+        'renderer/pepper/pepper_shared_memory_message_filter.cc',
+        'renderer/pepper/pepper_shared_memory_message_filter.h',
+        'renderer/pepper/pnacl_translation_resource_host.cc',
+        'renderer/pepper/pnacl_translation_resource_host.h',
+        'renderer/pepper/ppb_nacl_private_impl.cc',
+        'renderer/pepper/ppb_nacl_private_impl.h',
+        'renderer/pepper/ppb_pdf_impl.cc',
+        'renderer/pepper/ppb_pdf_impl.h',
+        'renderer/plugins/plugin_placeholder.cc',
+        'renderer/plugins/plugin_placeholder.h',
+        'renderer/plugins/plugin_uma.cc',
+        'renderer/plugins/plugin_uma.h',
+        'renderer/plugins/webview_plugin.cc',
+        'renderer/plugins/webview_plugin.h',
+        'renderer/prerender/prerender_dispatcher.cc',
+        'renderer/prerender/prerender_dispatcher.h',
+        'renderer/prerender/prerender_extra_data.cc',
+        'renderer/prerender/prerender_extra_data.h',
+        'renderer/prerender/prerender_helper.cc',
+        'renderer/prerender/prerender_helper.h',
+        'renderer/prerender/prerender_media_load_deferrer.cc',
+        'renderer/prerender/prerender_media_load_deferrer.h',
+        'renderer/prerender/prerenderer_client.cc',
+        'renderer/prerender/prerenderer_client.h',
+        'renderer/printing/print_web_view_helper.cc',
+        'renderer/printing/print_web_view_helper.h',
+        'renderer/printing/print_web_view_helper_linux.cc',
+        'renderer/printing/print_web_view_helper_mac.mm',
+        'renderer/printing/print_web_view_helper_win.cc',
+        'renderer/safe_browsing/feature_extractor_clock.cc',
+        'renderer/safe_browsing/feature_extractor_clock.h',
+        'renderer/safe_browsing/features.cc',
+        'renderer/safe_browsing/features.h',
+        'renderer/safe_browsing/malware_dom_details.cc',
+        'renderer/safe_browsing/malware_dom_details.h',
+        'renderer/safe_browsing/murmurhash3_util.cc',
+        'renderer/safe_browsing/murmurhash3_util.h',
+        'renderer/safe_browsing/phishing_classifier.cc',
+        'renderer/safe_browsing/phishing_classifier.h',
+        'renderer/safe_browsing/phishing_classifier_delegate.cc',
+        'renderer/safe_browsing/phishing_classifier_delegate.h',
+        'renderer/safe_browsing/phishing_dom_feature_extractor.cc',
+        'renderer/safe_browsing/phishing_dom_feature_extractor.h',
+        'renderer/safe_browsing/phishing_term_feature_extractor.cc',
+        'renderer/safe_browsing/phishing_term_feature_extractor.h',
+        'renderer/safe_browsing/phishing_url_feature_extractor.cc',
+        'renderer/safe_browsing/phishing_url_feature_extractor.h',
+        'renderer/safe_browsing/scorer.cc',
+        'renderer/safe_browsing/scorer.h',
+        'renderer/searchbox/searchbox.cc',
+        'renderer/searchbox/searchbox.h',
+        'renderer/searchbox/searchbox_extension.cc',
+        'renderer/searchbox/searchbox_extension.h',
+        'renderer/security_filter_peer.cc',
+        'renderer/security_filter_peer.h',
+        'renderer/spellchecker/cocoa_spelling_engine_mac.cc',
+        'renderer/spellchecker/cocoa_spelling_engine_mac.h',
+        'renderer/spellchecker/custom_dictionary_engine.cc',
+        'renderer/spellchecker/custom_dictionary_engine.h',
+        'renderer/spellchecker/hunspell_engine.cc',
+        'renderer/spellchecker/hunspell_engine.h',
+        'renderer/spellchecker/spellcheck_provider.cc',
+        'renderer/spellchecker/spellcheck_provider.h',
+        'renderer/spellchecker/spellcheck.cc',
+        'renderer/spellchecker/spellcheck.h',
+        'renderer/spellchecker/spellcheck_language.cc',
+        'renderer/spellchecker/spellcheck_language.h',
+        'renderer/spellchecker/spellcheck_worditerator.cc',
+        'renderer/spellchecker/spellcheck_worditerator.h',
+        'renderer/spellchecker/spelling_engine.h',
+        'renderer/static_v8_external_string_resource.cc',
+        'renderer/static_v8_external_string_resource.h',
+        'renderer/tts_dispatcher.cc',
+        'renderer/tts_dispatcher.h',
+        'renderer/translate/translate_helper.cc',
+        'renderer/translate/translate_helper.h',
+        'renderer/validation_message_agent.cc',
+        'renderer/validation_message_agent.h',
+        'renderer/web_apps.cc',
+        'renderer/web_apps.h',
+        'renderer/webview_color_overlay.cc',
+        'renderer/webview_color_overlay.h',
+      ],
+      'conditions': [
+        ['disable_nacl!=1', {
+          'dependencies': [
+            '../components/nacl.gyp:nacl',
+          ],
+        }],
+        ['enable_plugins==1', {
+          'dependencies': [
+            '../ppapi/ppapi_internal.gyp:ppapi_host',
+            '../ppapi/ppapi_internal.gyp:ppapi_proxy',
+            '../ppapi/ppapi_internal.gyp:ppapi_ipc',
+            '../ppapi/ppapi_internal.gyp:ppapi_shared',
+          ],
+        }, {  # enable_plugins==0
+          'sources/': [
+            ['exclude', '^renderer/pepper/'],
+          ],
+        }],
+        ['safe_browsing==1', {
+          'defines': [
+            'FULL_SAFE_BROWSING',
+          ],
+          'dependencies': [
+            'safe_browsing_proto',
+            '../third_party/smhasher/smhasher.gyp:murmurhash3',
+          ],
+        }, {  # safe_browsing==0 || safe_browsing==2
+          'sources/': [
+            ['exclude', '^renderer/safe_browsing/'],
+          ],
+        }],
+        ['enable_webrtc==0', {
+          'sources!': [
+            'renderer/media/chrome_webrtc_log_message_delegate.cc',
+            'renderer/media/chrome_webrtc_log_message_delegate.h',
+            'renderer/media/webrtc_logging_message_filter.cc',
+            'renderer/media/webrtc_logging_message_filter.h',
+          ],
+        }],
+        ['enable_spellcheck==0', {
+          'sources/': [
+            ['exclude', '^renderer/spellchecker/']
+          ],
+          'dependencies!': [
+            '../third_party/hunspell/hunspell.gyp:hunspell',
+          ],
+        }],
+        ['OS=="mac"', {
+          'dependencies': [
+            '../third_party/mach_override/mach_override.gyp:mach_override',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+            '../sandbox/sandbox.gyp:sandbox',
+          ],
+        }],
+        ['enable_automation==0', {
+          'sources/': [
+            ['exclude', '^renderer/automation/']
+          ]
+        }],
+	['enable_printing==0', {
+          'sources/': [
+            ['exclude', '^renderer/printing/']
+          ]
+	}],
+        ['OS=="android"', {
+          'sources!': [
+            'renderer/prerender/prerender_media_load_deferrer.cc',
+            'renderer/prerender/prerender_media_load_deferrer.h',
+          ],
+          'defines': [
+            'ENABLE_MOBILE_YOUTUBE_PLUGIN',
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+              'export_dependent_settings': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/chrome_repack_chrome.gypi b/chromium/chrome/chrome_repack_chrome.gypi
new file mode 100644
index 00000000000..a89543575fe
--- /dev/null
+++ b/chromium/chrome/chrome_repack_chrome.gypi
@@ -0,0 +1,36 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_chrome',
+  'variables': {
+    'pak_inputs': [
+      '<(grit_out_dir)/browser_resources.pak',
+      '<(grit_out_dir)/common_resources.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+    ],
+    'conditions': [
+      ['OS != "ios"', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
+        ],
+      }],
+      ['enable_extensions==1', {
+        'pak_inputs': [
+          '<(grit_out_dir)/extensions_api_resources.pak',
+        ],
+      }],
+    ],
+  },
+  'inputs': [
+    '<(repack_path)',
+    '<@(pak_inputs)',
+  ],
+  'outputs': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
+  ],
+  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+}
diff --git a/chromium/chrome/chrome_repack_chrome_100_percent.gypi b/chromium/chrome/chrome_repack_chrome_100_percent.gypi
new file mode 100644
index 00000000000..0d0a590ac47
--- /dev/null
+++ b/chromium/chrome/chrome_repack_chrome_100_percent.gypi
@@ -0,0 +1,33 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_chrome_resources_100_percent',
+  'variables': {
+    'pak_inputs': [
+      '<(grit_out_dir)/renderer_resources_100_percent.pak',
+      '<(grit_out_dir)/theme_resources_100_percent.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+    ],
+    'conditions': [
+      ['OS != "ios"', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
+        ],
+      }],
+      ['use_ash==1', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_100_percent.pak',
+        ],
+      }],
+    ],
+  },
+  'inputs': [
+    '<(repack_path)',
+    '<@(pak_inputs)',
+  ],
+  'outputs': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
+  ],
+  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+}
diff --git a/chromium/chrome/chrome_repack_chrome_200_percent.gypi b/chromium/chrome/chrome_repack_chrome_200_percent.gypi
new file mode 100644
index 00000000000..2e50e9dd92f
--- /dev/null
+++ b/chromium/chrome/chrome_repack_chrome_200_percent.gypi
@@ -0,0 +1,33 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_chrome_resources_200_percent',
+  'variables': {
+    'pak_inputs': [
+      '<(grit_out_dir)/renderer_resources_200_percent.pak',
+      '<(grit_out_dir)/theme_resources_200_percent.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
+    ],
+    'conditions': [
+      ['OS != "ios"', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak',
+        ],
+      }],
+      ['use_ash==1', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_200_percent.pak',
+        ],
+      }],
+    ],
+  },
+  'inputs': [
+    '<(repack_path)',
+    '<@(pak_inputs)',
+  ],
+  'outputs': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
+  ],
+  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+}
diff --git a/chromium/chrome/chrome_repack_chrome_touch_100_percent.gypi b/chromium/chrome/chrome_repack_chrome_touch_100_percent.gypi
new file mode 100644
index 00000000000..2992d937977
--- /dev/null
+++ b/chromium/chrome/chrome_repack_chrome_touch_100_percent.gypi
@@ -0,0 +1,28 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_chrome_touch_resources_100_percent',
+  'variables': {
+    'pak_inputs': [
+      '<(grit_out_dir)/renderer_resources_100_percent.pak',
+      '<(grit_out_dir)/theme_resources_touch_100_percent.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_100_percent.pak',
+    ],
+    'conditions': [
+      ['OS != "ios"', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
+        ],
+      }],
+    ],
+  },
+  'inputs': [
+    '<(repack_path)',
+    '<@(pak_inputs)',
+  ],
+  'outputs': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak',
+  ],
+  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+}
diff --git a/chromium/chrome/chrome_repack_chrome_touch_140_percent.gypi b/chromium/chrome/chrome_repack_chrome_touch_140_percent.gypi
new file mode 100644
index 00000000000..6eeb29632a0
--- /dev/null
+++ b/chromium/chrome/chrome_repack_chrome_touch_140_percent.gypi
@@ -0,0 +1,20 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_chrome_touch_resources_140_percent',
+  'variables': {
+    'pak_inputs': [
+      '<(grit_out_dir)/theme_resources_touch_140_percent.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_140_percent.pak',
+    ],
+  },
+  'inputs': [
+    '<(repack_path)',
+    '<@(pak_inputs)',
+  ],
+  'outputs': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_140_percent.pak',
+  ],
+  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+}
diff --git a/chromium/chrome/chrome_repack_chrome_touch_180_percent.gypi b/chromium/chrome/chrome_repack_chrome_touch_180_percent.gypi
new file mode 100644
index 00000000000..15b0c113ddc
--- /dev/null
+++ b/chromium/chrome/chrome_repack_chrome_touch_180_percent.gypi
@@ -0,0 +1,20 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_chrome_touch_resources_180_percent',
+  'variables': {
+    'pak_inputs': [
+      '<(grit_out_dir)/theme_resources_touch_180_percent.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_180_percent.pak',
+    ],
+  },
+  'inputs': [
+    '<(repack_path)',
+    '<@(pak_inputs)',
+  ],
+  'outputs': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_180_percent.pak',
+  ],
+  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+}
diff --git a/chromium/chrome/chrome_repack_locales.gypi b/chromium/chrome/chrome_repack_locales.gypi
new file mode 100644
index 00000000000..015d5413378
--- /dev/null
+++ b/chromium/chrome/chrome_repack_locales.gypi
@@ -0,0 +1,34 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_locales',
+  'variables': {
+    'conditions': [
+      ['branding=="Chrome"', {
+        'branding_flag': ['-b', 'google_chrome',],
+      }, {  # else: branding!="Chrome"
+        'branding_flag': ['-b', 'chromium',],
+      }],
+    ],
+    'repack_extra_flags%': [],
+    'repack_output_dir%': '<(SHARED_INTERMEDIATE_DIR)',
+  },
+  'inputs': [
+    'tools/build/repack_locales.py',
+    '<!@pymod_do_main(repack_locales -i -p <(OS) <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(repack_extra_flags) <(locales))'
+  ],
+  'outputs': [
+    '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(locales))'
+  ],
+  'action': [
+    '<@(repack_locales_cmd)',
+    '<@(branding_flag)',
+    '-p', '<(OS)',
+    '-g', '<(grit_out_dir)',
+    '-s', '<(SHARED_INTERMEDIATE_DIR)',
+    '-x', '<(repack_output_dir)/.',
+    '<@(repack_extra_flags)',
+    '<@(locales)',
+  ],
+}
diff --git a/chromium/chrome/chrome_repack_pseudo_locales.gypi b/chromium/chrome/chrome_repack_pseudo_locales.gypi
new file mode 100644
index 00000000000..340ed191955
--- /dev/null
+++ b/chromium/chrome/chrome_repack_pseudo_locales.gypi
@@ -0,0 +1,39 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_pseudo_locales',
+  'variables': {
+    'conditions': [
+      ['branding=="Chrome"', {
+        'branding_flag': ['-b', 'google_chrome',],
+      }, {  # else: branding!="Chrome"
+        'branding_flag': ['-b', 'chromium',],
+      }],
+    ],
+  },
+  'inputs': [
+    'tools/build/repack_locales.py',
+    '<!@pymod_do_main(repack_locales -i -p <(OS) <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))'
+  ],
+  'conditions': [
+    ['OS == "mac" or OS == "ios"', {
+      'outputs': [
+        '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pseudo_locales))'
+      ],
+    }, { # else 'OS != "mac"'
+      'outputs': [
+        '<(SHARED_INTERMEDIATE_DIR)/<(pseudo_locales).pak'
+      ],
+    }],
+  ],
+  'action': [
+    '<@(repack_locales_cmd)',
+    '<@(branding_flag)',
+    '-p', '<(OS)',
+    '-g', '<(grit_out_dir)',
+    '-s', '<(SHARED_INTERMEDIATE_DIR)',
+    '-x', '<(SHARED_INTERMEDIATE_DIR)/.',
+    '<@(pseudo_locales)',
+  ],
+}
diff --git a/chromium/chrome/chrome_repack_resources.gypi b/chromium/chrome/chrome_repack_resources.gypi
new file mode 100644
index 00000000000..8519aabd446
--- /dev/null
+++ b/chromium/chrome/chrome_repack_resources.gypi
@@ -0,0 +1,41 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_resources',
+  'variables': {
+    'pak_inputs': [
+      '<(grit_out_dir)/memory_internals_resources.pak',
+      '<(grit_out_dir)/net_internals_resources.pak',
+      '<(grit_out_dir)/signin_internals_resources.pak',
+      '<(grit_out_dir)/sync_internals_resources.pak',
+      '<(grit_out_dir)/translate_internals_resources.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
+    ],
+    'conditions': [
+      ['OS != "ios" and OS != "android"', {
+        # New paks should be added here by default.
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
+          '<(grit_out_dir)/component_extension_resources.pak',
+          '<(grit_out_dir)/options_resources.pak',
+          '<(grit_out_dir)/quota_internals_resources.pak',
+          '<(grit_out_dir)/sync_file_system_internals_resources.pak',
+        ],
+      }],
+      ['OS != "ios"', {
+        'pak_inputs': [
+          '<(grit_out_dir)/devtools_discovery_page_resources.pak',
+        ],
+      }],
+    ],
+  },
+  'inputs': [
+    '<(repack_path)',
+    '<@(pak_inputs)',
+  ],
+  'outputs': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
+  ],
+  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+}
diff --git a/chromium/chrome/chrome_resources.gyp b/chromium/chrome/chrome_resources.gyp
new file mode 100644
index 00000000000..30840648424
--- /dev/null
+++ b/chromium/chrome/chrome_resources.gyp
@@ -0,0 +1,482 @@
+# Copyright (c) 2012 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': {
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
+    'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
+    'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
+  },
+  'targets': [
+    {
+      'target_name': 'chrome_extra_resources',
+      'type': 'none',
+      # These resources end up in resources.pak because they are resources
+      # used by internal pages.  Putting them in a separate pak file makes
+      # it easier for us to reference them internally.
+      'actions': [
+        {
+          'action_name': 'memory_internals_resources',
+          'variables': {
+            'grit_grd_file': 'browser/resources/memory_internals_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'net_internals_resources',
+          'variables': {
+            'grit_grd_file': 'browser/resources/net_internals_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'signin_internals_resources',
+          'variables': {
+            'grit_grd_file': 'browser/resources/signin_internals_resources.grd',
+            },
+          'includes': ['../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'sync_internals_resources',
+          'variables': {
+            'grit_grd_file': 'browser/resources/sync_internals_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'translate_internals_resources',
+          'variables': {
+            'grit_grd_file': 'browser/resources/translate_internals_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+      'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
+            '../content/browser/tracing/tracing_resources.gyp:tracing_resources',
+          ],
+          'actions': [
+            {
+              'action_name': 'component_extension_resources',
+              'variables': {
+                'grit_grd_file': 'browser/resources/component_extension_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+            {
+              'action_name': 'options_resources',
+              'variables': {
+                'grit_grd_file': 'browser/resources/options_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+            {
+              'action_name': 'quota_internals_resources',
+              'variables': {
+                'grit_grd_file': 'browser/resources/quota_internals_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+            {
+              'action_name': 'devtools_discovery_page_resources',
+              'variables': {
+                'grit_grd_file':
+                   'browser/devtools/frontend/devtools_discovery_page_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ]
+            },
+            {
+              'action_name': 'sync_file_system_internals_resources',
+              'variables': {
+                'grit_grd_file': 'browser/resources/sync_file_system_internals_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+          ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/resources/extension/demo',
+              'files': [
+                'browser/resources/extension_resource/demo/library.js',
+              ],
+            },
+          ],
+        }],
+      ],
+    },
+    {
+      # TODO(mark): It would be better if each static library that needed
+      # to run grit would list its own .grd files, but unfortunately some
+      # of the static libraries currently have circular dependencies among
+      # generated headers.
+      'target_name': 'chrome_resources',
+      'type': 'none',
+      'dependencies': [
+        'about_credits',
+      ],
+      'actions': [
+        # Data resources.
+        {
+          'action_name': 'browser_resources',
+          'variables': {
+            'grit_grd_file': 'browser/browser_resources.grd',
+            'grit_additional_defines': [
+              '-E', 'about_credits_file=<(about_credits_file)',
+            ],
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'common_resources',
+          'variables': {
+            'grit_grd_file': 'common/common_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'renderer_resources',
+          'variables': {
+            'grit_grd_file': 'renderer/resources/renderer_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+      'conditions': [
+        ['enable_extensions==1', {
+          'actions': [
+            {
+              'action_name': 'extensions_api_resources',
+              'variables': {
+                'grit_grd_file': 'common/extensions_api_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            }
+          ],
+        }],
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+    },
+    {
+      # TODO(mark): It would be better if each static library that needed
+      # to run grit would list its own .grd files, but unfortunately some
+      # of the static libraries currently have circular dependencies among
+      # generated headers.
+      'target_name': 'chrome_strings',
+      'type': 'none',
+      'actions': [
+        # Localizable resources.
+        {
+          'action_name': 'locale_settings',
+          'variables': {
+            'grit_grd_file': 'app/resources/locale_settings.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'chromium_strings.grd',
+          'variables': {
+            'grit_grd_file': 'app/chromium_strings.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'generated_resources',
+          'variables': {
+            'grit_grd_file': 'app/generated_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'google_chrome_strings',
+          'variables': {
+            'grit_grd_file': 'app/google_chrome_strings.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+    },
+    {
+      'target_name': 'platform_locale_settings',
+      'type': 'none',
+      'variables': {
+        'conditions': [
+          ['OS=="win"', {
+            'platform_locale_settings_grd':
+                'app/resources/locale_settings_win.grd',
+          },],
+          ['OS=="linux"', {
+            'conditions': [
+              ['chromeos==1', {
+                'conditions': [
+                  ['branding=="Chrome"', {
+                    'platform_locale_settings_grd':
+                        'app/resources/locale_settings_google_chromeos.grd',
+                  }, {  # branding!=Chrome
+                    'platform_locale_settings_grd':
+                        'app/resources/locale_settings_chromiumos.grd',
+                  }],
+                ]
+              }, {  # chromeos==0
+                'platform_locale_settings_grd':
+                    'app/resources/locale_settings_linux.grd',
+              }],
+            ],
+          },],
+          ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "linux"', {
+            'platform_locale_settings_grd':
+                'app/resources/locale_settings_linux.grd',
+          },],
+          ['OS == "mac" or OS == "ios"', {
+            'platform_locale_settings_grd':
+                'app/resources/locale_settings_mac.grd',
+          }],
+        ],  # conditions
+      },  # variables
+      'actions': [
+        {
+          'action_name': 'platform_locale_settings',
+          'variables': {
+            'grit_grd_file': '<(platform_locale_settings_grd)',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+    },
+    {
+      'target_name': 'theme_resources_gen',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'theme_resources',
+          'variables': {
+            'grit_grd_file': 'app/theme/theme_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+    },
+    {
+      'target_name': 'theme_resources',
+      'type': 'none',
+      'dependencies': [
+        'chrome_unscaled_resources',
+        'theme_resources_gen',
+        '<(DEPTH)/ui/ui.gyp:ui_resources',
+      ],
+    },
+    {
+      'target_name': 'packed_extra_resources',
+      'type': 'none',
+      'variables': {
+        'repack_path': '../tools/grit/grit/format/repack.py',
+      },
+      'dependencies': [
+        'chrome_extra_resources',
+      ],
+      'actions': [
+        {
+          'includes': ['chrome_repack_resources.gypi']
+        },
+      ],
+      'conditions': [
+        ['OS != "mac" and OS != "ios"', {
+          # We'll install the resource files to the product directory.  The Mac
+          # copies the results over as bundle resources in its own special way.
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak'
+              ],
+            },
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'packed_resources',
+      'type': 'none',
+      'variables': {
+        'repack_path': '../tools/grit/grit/format/repack.py',
+      },
+      'dependencies': [
+        # MSVS needs the dependencies explictly named, Make is able to
+        # derive the dependencies from the output files.
+        'chrome_resources',
+        'chrome_strings',
+        'platform_locale_settings',
+        'theme_resources',
+        '<(DEPTH)/components/component_strings.gyp:component_strings',
+        '<(DEPTH)/net/net.gyp:net_resources',
+        '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
+        '<(DEPTH)/ui/ui.gyp:ui_resources',
+      ],
+      'actions': [
+        {
+          'includes': ['chrome_repack_chrome.gypi']
+        },
+        {
+          'includes': ['chrome_repack_locales.gypi']
+        },
+        {
+          'includes': ['chrome_repack_pseudo_locales.gypi']
+        },
+        {
+          'includes': ['chrome_repack_chrome_100_percent.gypi']
+        },
+        {
+          'includes': ['chrome_repack_chrome_200_percent.gypi']
+        },
+        {
+          'includes': ['chrome_repack_chrome_touch_100_percent.gypi']
+        },
+        {
+          'includes': ['chrome_repack_chrome_touch_140_percent.gypi']
+        },
+        {
+          'includes': ['chrome_repack_chrome_touch_180_percent.gypi']
+        },
+      ],
+      'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            # TODO(zork): Protect this with if use_aura==1
+            '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
+            '<(DEPTH)/content/content_resources.gyp:content_resources',
+            '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_strings',
+            '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+            '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
+          ],
+        }],
+        ['use_ash==1', {
+          'dependencies': [
+             '<(DEPTH)/ash/ash.gyp:ash_resources',
+          ],
+        }],
+        ['OS != "mac" and OS != "ios"', {
+          # Copy pak files to the product directory. These files will be picked
+          # up by the following installer scripts:
+          #   - Windows: chrome/installer/mini_installer/chrome.release
+          #   - Linux: chrome/installer/linux/internal/common/installer.include
+          # Ensure that the above scripts are updated when adding or removing
+          # pak files.
+          # Copying files to the product directory is not needed on the Mac
+          # since the framework build phase will copy them into the framework
+          # bundle directly.
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak'
+              ],
+            },
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak'
+              ],
+            },
+            {
+              'destination': '<(PRODUCT_DIR)/locales',
+              'files': [
+                '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))'
+              ],
+            },
+            {
+              'destination': '<(PRODUCT_DIR)/pseudo_locales',
+              'files': [
+                '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pseudo_locales))'
+              ],
+            },
+          ],
+          'conditions': [
+            ['branding=="Chrome"', {
+              'copies': [
+                {
+                  # This location is for the Windows and Linux builds. For
+                  # Windows, the chrome.release file ensures that these files
+                  # are copied into the installer. Note that we have a separate
+                  # section in chrome_dll.gyp to copy these files for Mac, as it
+                  # needs to be dropped inside the framework.
+                  'destination': '<(PRODUCT_DIR)/default_apps',
+                  'files': ['<@(default_apps_list)']
+                },
+              ],
+            }],
+            ['enable_hidpi == 1 and OS!="win"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': [
+                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
+                  ],
+                },
+              ],
+            }],
+            ['enable_touch_ui==1', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': [
+                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak',
+                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_140_percent.pak',
+                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_180_percent.pak',
+                  ],
+                },
+              ],
+            }],
+          ], # conditions
+        }], # end OS != "mac" and OS != "ios"
+      ], # conditions
+    },
+    {
+      'target_name': 'chrome_unscaled_resources',
+      'type': 'none',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
+      },
+      'actions': [
+        {
+          'action_name': 'chrome_unscaled_resources',
+          'variables': {
+            'grit_grd_file': 'app/theme/chrome_unscaled_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+    },
+    {
+      'target_name': 'about_credits',
+      'type': 'none',
+      'actions': [
+        {
+          'variables': {
+            'generator_path': '../tools/licenses.py',
+          },
+          'action_name': 'generate_about_credits',
+          'inputs': [
+            # TODO(phajdan.jr): make licenses.py print inputs too.
+            '<(generator_path)',
+          ],
+          'outputs': [
+            '<(about_credits_file)',
+          ],
+          'hard_dependency': 1,
+          'action': ['python',
+                     '<(generator_path)',
+                     'credits',
+                     '<(about_credits_file)',
+          ],
+          'message': 'Generating about:credits.',
+        },
+      ],
+    },
+  ], # targets
+}
diff --git a/chromium/chrome/chrome_syzygy.gyp b/chromium/chrome/chrome_syzygy.gyp
new file mode 100644
index 00000000000..d4994ac1813
--- /dev/null
+++ b/chromium/chrome/chrome_syzygy.gyp
@@ -0,0 +1,38 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'conditions': [
+    ['OS=="win" and fastbuild==0', {
+      'variables': {
+        'dll_name': 'chrome',
+      },
+      'targets': [
+        {
+          'target_name': 'chrome_dll_syzygy',
+          'type': 'none',
+          'sources' : [],
+          'includes': [
+            'chrome_syzygy.gypi',
+          ],
+        },
+      ],
+    }],
+    # Note, not else.
+    ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1', {
+      'variables': {
+        'dll_name': 'chrome_child',
+      },
+      'targets': [
+        {
+          'target_name': 'chrome_child_dll_syzygy',
+          'type': 'none',
+          'sources' : [],
+          'includes': [
+            'chrome_syzygy.gypi',
+          ],
+        },
+      ],
+    }],
+  ],
+}
diff --git a/chromium/chrome/chrome_syzygy.gypi b/chromium/chrome/chrome_syzygy.gypi
new file mode 100644
index 00000000000..0fbf6bc548b
--- /dev/null
+++ b/chromium/chrome/chrome_syzygy.gypi
@@ -0,0 +1,78 @@
+# Copyright 2013 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.
+
+# Intended to be included by chrome_syzygy.gyp. A variable 'dll_name' should
+# be set to the base name of the DLL. This is used to generate the build steps
+# for both chrome.dll and chrome_child.dll when in multiple dll mode.
+{
+  # Reorder or instrument the initial chrome DLL executable, placing the
+  # optimized output and corresponding PDB file into the "syzygy"
+  # subdirectory.
+  # This target won't build in fastbuild, since there are no PDBs.
+  'dependencies': [
+    '<(DEPTH)/chrome/chrome.gyp:<(dll_name)_dll',
+  ],
+  'variables': {
+    'dest_dir': '<(PRODUCT_DIR)/syzygy',
+  },
+  'conditions': [
+    ['asan!=1', {
+      # Reorder chrome DLL executable.
+      # If there's a matching chrome.dll-ordering.json file present in
+      # the output directory, chrome.dll will be ordered according to
+      # that, otherwise it will be randomized.
+      'actions': [
+        {
+          'action_name': 'Reorder Chrome with Syzygy',
+          'msvs_cygwin_shell': 0,
+          'inputs': [
+            '<(PRODUCT_DIR)/<(dll_name).dll',
+            '<(PRODUCT_DIR)/<(dll_name).dll.pdb',
+          ],
+          'outputs': [
+            '<(dest_dir)/<(dll_name).dll',
+            '<(dest_dir)/<(dll_name).dll.pdb',
+          ],
+          'action': [
+            'python',
+            '<(DEPTH)/chrome/tools/build/win/syzygy_reorder.py',
+            '--input_executable', '<(PRODUCT_DIR)/<(dll_name).dll',
+            '--input_symbol', '<(PRODUCT_DIR)/<(dll_name).dll.pdb',
+            '--destination_dir', '<(dest_dir)',
+          ],
+        },
+      ],
+    }, {
+      # Instrument chrome DLL executable with SyzyAsan.
+      'actions': [
+        {
+          'action_name': 'Instrument Chrome with SyzyAsan',
+          'msvs_cygwin_shell': 0,
+          'inputs': [
+            '<(PRODUCT_DIR)/<(dll_name).dll',
+            '<(PRODUCT_DIR)/<(dll_name).dll.pdb',
+            '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt',
+          ],
+          'outputs': [
+            '<(dest_dir)/<(dll_name).dll',
+            '<(dest_dir)/<(dll_name).dll.pdb',
+            '<(dest_dir)/asan_rtl.dll',
+            '<(dest_dir)/asan_rtl.dll.pdb',
+            '<(dest_dir)/win-syzyasan-filter.txt.json',
+          ],
+          'action': [
+            'python',
+            '<(DEPTH)/chrome/tools/build/win/syzygy_instrument.py',
+            '--mode', 'asan',
+            '--input_executable', '<(PRODUCT_DIR)/<(dll_name).dll',
+            '--input_symbol', '<(PRODUCT_DIR)/<(dll_name).dll.pdb',
+            '--filter',
+            '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt',
+            '--destination_dir', '<(dest_dir)',
+          ],
+        },
+      ],
+    }],
+  ],
+}
diff --git a/chromium/chrome/chrome_tests.gypi b/chromium/chrome/chrome_tests.gypi
new file mode 100644
index 00000000000..4a43df7a317
--- /dev/null
+++ b/chromium/chrome/chrome_tests.gypi
@@ -0,0 +1,3424 @@
+# Copyright 2013 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' : {
+    'pyautolib_sources': [
+      'app/chrome_command_ids.h',
+      'app/chrome_dll_resource.h',
+      'common/automation_constants.h',
+      'common/pref_names.cc',
+      'common/pref_names.h',
+      'browser/chromeos/cros/network_constants.h',
+      'test/automation/browser_proxy.cc',
+      'test/automation/browser_proxy.h',
+      'test/automation/tab_proxy.cc',
+      'test/automation/tab_proxy.h',
+      '../content/public/common/page_type.h',
+      '../content/public/common/security_style.h',
+      # Must come before cert_status_flags.h
+      '../net/base/net_export.h',
+      '../net/cert/cert_status_flags.h',
+    ],
+    'conditions': [
+      ['asan==1', {
+        'pyautolib_sources': [
+          'test/pyautolib/asan_stub.c',
+        ]
+      }],
+    ],
+  },
+  'includes': [
+    'js_unittest_vars.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'test_support_ui_runner',
+      'type': 'static_library',
+      'dependencies': [
+        'test_support_common',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'export_dependent_settings': [
+        'test_support_common',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/ui/run_all_unittests.cc',
+      ],
+    },
+    {
+      'target_name': 'test_support_ui',
+      'type': 'static_library',
+      'dependencies': [
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:theme_resources',
+        'test_support_common',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'export_dependent_settings': [
+        'test_support_common',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/automation/proxy_launcher.cc',
+        'test/automation/proxy_launcher.h',
+        'test/reliability/automated_ui_test_base.cc',
+        'test/reliability/automated_ui_test_base.h',
+        'test/ui/javascript_test_util.cc',
+        'test/ui/run_all_unittests.cc',
+        'test/ui/ui_perf_test.cc',
+        'test/ui/ui_perf_test.h',
+        'test/ui/ui_test.cc',
+        'test/ui/ui_test.h',
+        'test/ui/ui_test_suite.cc',
+        'test/ui/ui_test_suite.h',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            'chrome.gyp:crash_service',  # run time dependency
+          ],
+        }],
+        ['OS=="win" and target_arch=="ia32"', {
+          'dependencies': [
+            'chrome.gyp:crash_service_win64',  # run time dependency
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4267, ],
+    },
+    {
+      'target_name': 'automated_ui_tests',
+      'type': 'executable',
+      'dependencies': [
+        'browser',
+        'chrome_resources.gyp:theme_resources',
+        'renderer',
+        'test_support_common',
+        'test_support_ui',
+        'test_support_ui_runner',
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../third_party/libxml/libxml.gyp:libxml',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/reliability/automated_ui_tests.cc',
+        'test/reliability/automated_ui_tests.h',
+      ],
+      'conditions': [
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        },],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            'automated_ui_tests_exe_pdb_workaround',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+        }],
+        ['OS=="linux" and enable_webrtc==1', {
+          'dependencies': [
+            # TODO(tommi): Figure out why the 32bit lucid builder fails to
+            # find this dependency for this target (other builders pick it up
+            # correctly).  crbug.com/231068.
+            '../third_party/libjingle/libjingle.gyp:libpeerconnection',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'interactive_ui_tests',
+      'type': 'executable',
+      'dependencies': [
+        'browser',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:packed_extra_resources',
+        'chrome_resources.gyp:packed_resources',
+        'common/extensions/api/api.gyp:api',
+        'debugger',
+        'renderer',
+        'test_support_common',
+        # NOTE: don't add test_support_ui, no more UITests. See
+        # http://crbug.com/137365
+        '../third_party/hunspell/hunspell.gyp:hunspell',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_resources',
+        '../net/net.gyp:net_test_support',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/libpng/libpng.gyp:libpng',
+        '../third_party/zlib/zlib.gyp:zlib',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/npapi/npapi.gyp:npapi',
+        # Runtime dependencies
+        '../ppapi/ppapi_internal.gyp:ppapi_tests',
+        '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
+        '../webkit/webkit_resources.gyp:webkit_resources',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+        'INTERACTIVE_TESTS',
+      ],
+      'sources': [
+        '../apps/app_shim/app_shim_quit_interactive_uitest_mac.mm',
+        'browser/autofill/autofill_interactive_uitest.cc',
+        'browser/browser_keyevents_browsertest.cc',
+        'browser/extensions/api/omnibox/omnibox_api_interactive_test.cc',
+        'browser/extensions/api/tabs/tabs_interactive_test.cc',
+        'browser/extensions/extension_apitest.cc',
+        'browser/extensions/extension_browsertest.cc',
+        'browser/extensions/extension_crash_recovery_browsertest.cc',
+        'browser/extensions/extension_function_test_utils.cc',
+        'browser/extensions/extension_keybinding_apitest.cc',
+        'browser/extensions/extension_test_message_listener.cc',
+        'browser/extensions/extension_test_message_listener.h',
+        'browser/extensions/notifications_apitest.cc',
+        'browser/extensions/platform_app_browsertest_util.cc',
+        'browser/extensions/platform_app_browsertest_util.h',
+        'browser/extensions/web_view_interactive_browsertest.cc',
+        'browser/extensions/window_open_interactive_apitest.cc',
+        'browser/extensions/extension_fullscreen_apitest.cc',
+        'browser/extensions/extension_pointer_lock_apitest.cc',
+        'browser/mouseleave_browsertest.cc',
+        'browser/notifications/desktop_notifications_unittest.cc',
+        'browser/notifications/desktop_notifications_unittest.h',
+        'browser/notifications/notification_browsertest.cc',
+        'browser/printing/print_dialog_cloud_interative_uitest.cc',
+        'browser/task_manager/task_manager_browsertest_util.cc',
+        'browser/ui/browser_focus_uitest.cc',
+        'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm',
+        'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc',
+        'browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bubble_gtk_browsertest.cc',
+        'browser/ui/omnibox/omnibox_view_browsertest.cc',
+        'browser/ui/panels/base_panel_browser_test.cc',
+        'browser/ui/panels/base_panel_browser_test.h',
+        'browser/ui/panels/detached_panel_browsertest.cc',
+        'browser/ui/panels/docked_panel_browsertest.cc',
+        'browser/ui/panels/panel_browsertest.cc',
+        'browser/ui/panels/panel_drag_browsertest.cc',
+        'browser/ui/panels/panel_resize_browsertest.cc',
+        'browser/ui/panels/stacked_panel_browsertest.cc',
+        'browser/ui/panels/test_panel_active_state_observer.cc',
+        'browser/ui/panels/test_panel_active_state_observer.h',
+        'browser/ui/panels/test_panel_mouse_watcher.cc',
+        'browser/ui/panels/test_panel_mouse_watcher.h',
+        'browser/ui/panels/test_panel_notification_observer.cc',
+        'browser/ui/panels/test_panel_notification_observer.h',
+        'browser/ui/panels/test_panel_collection_squeeze_observer.cc',
+        'browser/ui/panels/test_panel_collection_squeeze_observer.h',
+        'browser/ui/search/instant_extended_interactive_uitest.cc',
+        'browser/ui/search/instant_extended_manual_interactive_uitest.cc',
+        'browser/ui/search/instant_test_utils.h',
+        'browser/ui/search/instant_test_utils.cc',
+        'browser/ui/search/local_ntp_browsertest.cc',
+        'browser/ui/startup/startup_browser_creator_interactive_uitest.cc',
+        'browser/ui/views/ash/tab_scrubber_browsertest.cc',
+        'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
+        'browser/ui/views/button_dropdown_test.cc',
+        'browser/ui/views/constrained_window_views_browsertest.cc',
+        'browser/ui/views/find_bar_controller_interactive_uitest.cc',
+        'browser/ui/views/find_bar_host_interactive_uitest.cc',
+        'browser/ui/views/frame/browser_view_focus_uitest.cc',
+        'browser/ui/views/frame/browser_view_interactive_uitest.cc',
+        'browser/ui/views/keyboard_access_browsertest.cc',
+        'browser/ui/views/location_bar/star_view_browsertest.cc',
+        'browser/ui/views/menu_item_view_test.cc',
+        'browser/ui/views/menu_model_adapter_test.cc',
+        'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
+        'browser/ui/views/native_widget_win_interactive_uitest.cc',
+        'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
+        'browser/ui/views/panels/panel_view_browsertest.cc',
+        'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
+        'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
+        'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
+        'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
+        'test/base/chrome_test_launcher.cc',
+        'test/base/interactive_test_utils.cc',
+        'test/base/interactive_test_utils.h',
+        'test/base/interactive_test_utils_aura.cc',
+        'test/base/interactive_test_utils_aura.h',
+        'test/base/interactive_test_utils_gtk.cc',
+        'test/base/interactive_test_utils_mac.mm',
+        'test/base/interactive_test_utils_views.cc',
+        'test/base/interactive_test_utils_win.cc',
+        'test/base/view_event_test_base.cc',
+        'test/base/view_event_test_base.h',
+        'test/ppapi/ppapi_interactive_browsertest.cc',
+      ],
+      'conditions': [
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+          'sources!': [
+            'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+          'dependencies': [
+            '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
+          'sources!': [
+            # TODO(port)
+            'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
+            'browser/ui/views/button_dropdown_test.cc',
+            'browser/ui/views/constrained_window_views_browsertest.cc',
+            'browser/ui/views/crypto_module_password_dialog_view_unittest.cc',
+            'browser/ui/views/find_bar_host_interactive_uitest.cc',
+            'browser/ui/views/keyboard_access_browsertest.cc',
+            'browser/ui/views/menu_item_view_test.cc',
+            'browser/ui/views/menu_model_adapter_test.cc',
+            'test/base/view_event_test_base.cc',
+            'test/base/view_event_test_base.h',
+          ],
+        }],
+        ['use_ash==1', {
+          'sources': [
+            '../ash/drag_drop/drag_drop_interactive_uitest.cc',
+            'browser/ui/window_sizer/window_sizer_ash_uitest.cc',
+          ],
+        }],
+        ['OS=="linux" and toolkit_views==1', {
+          'sources!': [
+            # TODO(port)
+            'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
+          ],
+        }],
+        ['OS=="mac"', {
+          'sources!': [
+            # TODO(port)
+            'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
+            'browser/ui/views/button_dropdown_test.cc',
+            'browser/ui/views/constrained_window_views_browsertest.cc',
+            'browser/ui/views/find_bar_host_interactive_uitest.cc',
+            'browser/ui/views/keyboard_access_browsertest.cc',
+            'browser/ui/views/menu_item_view_test.cc',
+            'browser/ui/views/menu_model_adapter_test.cc',
+            'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
+            'test/base/view_event_test_base.cc',
+            'test/base/view_event_test_base.h',
+          ],
+          'dependencies': [
+            'chrome'
+          ],
+          # See comment about the same line in chrome/chrome_tests.gypi.
+          'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+        }],  # OS=="mac"
+        ['notifications==0', {
+          'sources/': [
+            ['exclude', '^browser/notifications/'],
+            ['exclude', '^browser/extensions/notifications_apitest.cc'],
+          ],
+        }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../ui/views/views.gyp:views',
+            '../ui/views/views.gyp:views_test_support',
+          ],
+        }, { # else: toolkit_views == 0
+          'sources/': [
+            ['exclude', '^browser/ui/views/'],
+          ],
+        }],
+        ['use_ash==1', {
+          'dependencies': [
+            '../ash/ash.gyp:ash_test_support',
+          ],
+        }],
+        ['use_aura==1', {
+          'sources!': [
+            'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
+          ],
+        }],
+        ['chromeos==1', {
+          'dependencies': [
+            '../chromeos/chromeos.gyp:chromeos',
+          ],
+          'sources': [
+            'browser/chromeos/cros/cros_in_process_browser_test.cc',
+            'browser/chromeos/cros/cros_in_process_browser_test.h',
+            'browser/chromeos/input_method/keyboard_browsertest.cc',
+            'browser/chromeos/input_method/textinput_browsertest.cc',
+            'browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc',
+            'browser/chromeos/input_method/textinput_test_helper.cc',
+            'browser/chromeos/input_method/textinput_test_helper.h',
+            'browser/chromeos/login/captive_portal_window_browsertest.cc',
+            'browser/chromeos/login/eula_browsertest.cc',
+            'browser/chromeos/login/login_browsertest.cc',
+            'browser/chromeos/login/oobe_browsertest.cc',
+            'browser/chromeos/login/screen_locker_browsertest.cc',
+            'browser/chromeos/login/screen_locker_tester.cc',
+            'browser/chromeos/login/screen_locker_tester.h',
+            'browser/chromeos/login/wallpaper_manager_browsertest.cc',
+            'test/data/chromeos/service_login.html',
+          ],
+          'sources!': [
+            # chromeos does not use cross-platform panels
+            'browser/ui/panels/detached_panel_browsertest.cc',
+            'browser/ui/panels/docked_panel_browsertest.cc',
+            'browser/ui/panels/panel_browsertest.cc',
+            'browser/ui/panels/panel_drag_browsertest.cc',
+            'browser/ui/panels/panel_resize_browsertest.cc',
+            'browser/ui/panels/stacked_panel_browsertest.cc',
+            'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
+            'browser/ui/views/panels/panel_view_browsertest.cc',
+            'browser/notifications/desktop_notifications_unittest.cc',
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '../third_party/wtl/include',
+          ],
+          'dependencies': [
+            'chrome.gyp:chrome_version_resources',
+            '../third_party/isimpledom/isimpledom.gyp:isimpledom',
+            '../ui/ui.gyp:ui_resources',
+          ],
+          'sources': [
+            '../ui/resources/cursors/aliasb.cur',
+            '../ui/resources/cursors/cell.cur',
+            '../ui/resources/cursors/col_resize.cur',
+            '../ui/resources/cursors/copy.cur',
+            '../ui/resources/cursors/none.cur',
+            '../ui/resources/cursors/row_resize.cur',
+            '../ui/resources/cursors/vertical_text.cur',
+            '../ui/resources/cursors/zoom_in.cur',
+            '../ui/resources/cursors/zoom_out.cur',
+
+            'app/chrome_dll.rc',
+            'test/data/resource.rc',
+
+            # TODO:  It would be nice to have these pulled in
+            # automatically from direct_dependent_settings in
+            # their various targets (net.gyp:net_resources, etc.),
+            # but that causes errors in other targets when
+            # resulting .res files get referenced multiple times.
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
+
+            'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                 '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+            ['use_aura==1', {
+              'sources/': [
+                ['exclude', '^browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc'],
+                ['exclude', '^browser/ui/views/native_widget_win_interactive_uitest.cc'],
+              ],
+            }],
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'conditions': [
+                ['incremental_chrome_dll==1', {
+                  'UseLibraryDependencyInputs': "true",
+                }],
+              ],
+            },
+          },
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        }, { # else: OS != "win"
+          'sources!': [
+            'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
+            'browser/ui/views/native_widget_win_interactive_uitest.cc',
+          ],
+        }],  # OS != "win"
+      ],  # conditions
+    },
+    {
+      # Third-party support sources for chromedriver_lib.
+      'target_name': 'chromedriver_support',
+      'type': 'static_library',
+      'sources': [
+        '../third_party/mongoose/mongoose.c',
+        '../third_party/mongoose/mongoose.h',
+        '../third_party/webdriver/atoms.cc',
+        '../third_party/webdriver/atoms.h',
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      # Although this one is probably safe to ignore.
+      # Mongose casts -1 directly as HANDLE (definitely safe to ignore).
+      'msvs_disabled_warnings': [4267, 4306, ],
+   },
+    {
+      # chromedriver is the chromium implementation of WebDriver.
+      # See http://www.chromium.org/developers/testing/webdriver-for-chrome
+      'target_name': 'chromedriver_lib',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../net/net.gyp:net',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/libxml/libxml.gyp:libxml',
+        '../url/url.gyp:url_lib',
+        'browser',
+        'chrome',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chromedriver_support',
+        'common',
+        'test_support_ui',
+        'test_support_ui_runner',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/webdriver/commands/alert_commands.cc',
+        'test/webdriver/commands/alert_commands.h',
+        'test/webdriver/commands/appcache_status_command.cc',
+        'test/webdriver/commands/appcache_status_command.h',
+        'test/webdriver/commands/browser_connection_commands.cc',
+        'test/webdriver/commands/browser_connection_commands.h',
+        'test/webdriver/commands/chrome_commands.cc',
+        'test/webdriver/commands/chrome_commands.h',
+        'test/webdriver/commands/command.cc',
+        'test/webdriver/commands/command.h',
+        'test/webdriver/commands/cookie_commands.cc',
+        'test/webdriver/commands/cookie_commands.h',
+        'test/webdriver/commands/create_session.cc',
+        'test/webdriver/commands/create_session.h',
+        'test/webdriver/commands/execute_async_script_command.cc',
+        'test/webdriver/commands/execute_async_script_command.h',
+        'test/webdriver/commands/execute_command.cc',
+        'test/webdriver/commands/execute_command.h',
+        'test/webdriver/commands/file_upload_command.cc',
+        'test/webdriver/commands/file_upload_command.h',
+        'test/webdriver/commands/find_element_commands.cc',
+        'test/webdriver/commands/find_element_commands.h',
+        'test/webdriver/commands/html5_location_commands.cc',
+        'test/webdriver/commands/html5_location_commands.h',
+        'test/webdriver/commands/html5_storage_commands.cc',
+        'test/webdriver/commands/html5_storage_commands.h',
+        'test/webdriver/commands/keys_command.cc',
+        'test/webdriver/commands/keys_command.h',
+        'test/webdriver/commands/log_command.cc',
+        'test/webdriver/commands/log_command.h',
+        'test/webdriver/commands/navigate_commands.cc',
+        'test/webdriver/commands/navigate_commands.h',
+        'test/webdriver/commands/mouse_commands.cc',
+        'test/webdriver/commands/mouse_commands.h',
+        'test/webdriver/commands/response.h',
+        'test/webdriver/commands/response.cc',
+        'test/webdriver/commands/screenshot_command.cc',
+        'test/webdriver/commands/screenshot_command.h',
+        'test/webdriver/commands/session_with_id.cc',
+        'test/webdriver/commands/session_with_id.h',
+        'test/webdriver/commands/set_timeout_commands.cc',
+        'test/webdriver/commands/set_timeout_commands.h',
+        'test/webdriver/commands/source_command.cc',
+        'test/webdriver/commands/source_command.h',
+        'test/webdriver/commands/target_locator_commands.cc',
+        'test/webdriver/commands/target_locator_commands.h',
+        'test/webdriver/commands/title_command.cc',
+        'test/webdriver/commands/title_command.h',
+        'test/webdriver/commands/url_command.cc',
+        'test/webdriver/commands/url_command.h',
+        'test/webdriver/commands/webdriver_command.cc',
+        'test/webdriver/commands/webdriver_command.h',
+        'test/webdriver/commands/webelement_commands.cc',
+        'test/webdriver/commands/webelement_commands.h',
+        'test/webdriver/commands/window_commands.cc',
+        'test/webdriver/commands/window_commands.h',
+        'test/webdriver/frame_path.cc',
+        'test/webdriver/frame_path.h',
+        'test/webdriver/http_response.cc',
+        'test/webdriver/http_response.h',
+        'test/webdriver/keycode_text_conversion.h',
+        'test/webdriver/keycode_text_conversion_gtk.cc',
+        'test/webdriver/keycode_text_conversion_mac.mm',
+        'test/webdriver/keycode_text_conversion_win.cc',
+        'test/webdriver/keycode_text_conversion_x.cc',
+        'test/webdriver/webdriver_automation.cc',
+        'test/webdriver/webdriver_automation.h',
+        'test/webdriver/webdriver_basic_types.cc',
+        'test/webdriver/webdriver_basic_types.h',
+        'test/webdriver/webdriver_capabilities_parser.cc',
+        'test/webdriver/webdriver_capabilities_parser.h',
+        'test/webdriver/webdriver_dispatch.cc',
+        'test/webdriver/webdriver_dispatch.h',
+        'test/webdriver/webdriver_element_id.cc',
+        'test/webdriver/webdriver_element_id.h',
+        'test/webdriver/webdriver_error.cc',
+        'test/webdriver/webdriver_error.h',
+        'test/webdriver/webdriver_key_converter.cc',
+        'test/webdriver/webdriver_key_converter.h',
+        'test/webdriver/webdriver_logging.cc',
+        'test/webdriver/webdriver_logging.h',
+        'test/webdriver/webdriver_session.cc',
+        'test/webdriver/webdriver_session.h',
+        'test/webdriver/webdriver_session_manager.cc',
+        'test/webdriver/webdriver_session_manager.h',
+        'test/webdriver/webdriver_switches.cc',
+        'test/webdriver/webdriver_switches.h',
+        'test/webdriver/webdriver_util.cc',
+        'test/webdriver/webdriver_util.h',
+        'test/webdriver/webdriver_util_mac.mm',
+      ],
+      'conditions': [
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+          'sources!': [
+            'test/webdriver/keycode_text_conversion_x.cc',
+          ],
+        }],
+        ['toolkit_uses_gtk == 0', {
+          'sources!': [
+            'test/webdriver/keycode_text_conversion_gtk.cc',
+          ],
+        }],
+        ['OS=="linux" and toolkit_views==1', {
+          'dependencies': [
+            '../ui/views/views.gyp:views',
+          ],
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'chromedriver',
+      'type': 'executable',
+      'dependencies': [
+        'chromedriver_lib',
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/webdriver/webdriver_server.cc',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lOleAcc.lib',
+              '-lws2_32.lib',
+            ],
+          },
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                },
+              },
+            },
+          },
+        }],
+      ]
+    },
+    {
+      'target_name': 'chromedriver_unittests',
+      'type': 'executable',
+      'dependencies': [
+        'chromedriver_lib',
+        '../base/base.gyp:run_all_unittests',
+        '../base/base.gyp:test_support_base',
+        '../testing/gtest.gyp:gtest',
+        '../skia/skia.gyp:skia',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/webdriver/commands/set_timeout_commands_unittest.cc',
+        'test/webdriver/frame_path_unittest.cc',
+        'test/webdriver/http_response_unittest.cc',
+        'test/webdriver/keycode_text_conversion_unittest.cc',
+        'test/webdriver/webdriver_capabilities_parser_unittest.cc',
+        'test/webdriver/webdriver_dispatch_unittest.cc',
+        'test/webdriver/webdriver_key_converter_unittest.cc',
+        'test/webdriver/webdriver_test_util.cc',
+        'test/webdriver/webdriver_test_util.h',
+        'test/webdriver/webdriver_util_unittest.cc',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lOleAcc.lib',
+              '-lws2_32.lib',
+            ],
+          },
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                },
+              },
+            },
+          },
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'chrome_devtools_lib',
+      'type': 'static_library',
+      'hard_dependency': 1,
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../net/net.gyp:net',
+        '../third_party/zlib/zlib.gyp:minizip',
+        '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/ui.gyp:ui',
+        '../url/url.gyp:url_lib',
+      ],
+      'include_dirs': [
+        '..',
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)',
+        ],
+      },
+      'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.h',
+        'test/chromedriver/chrome/adb.h',
+        'test/chromedriver/chrome/adb_impl.cc',
+        'test/chromedriver/chrome/adb_impl.h',
+        'test/chromedriver/chrome/automation_extension.cc',
+        'test/chromedriver/chrome/automation_extension.h',
+        'test/chromedriver/chrome/chrome.h',
+        'test/chromedriver/chrome/chrome_android_impl.cc',
+        'test/chromedriver/chrome/chrome_android_impl.h',
+        'test/chromedriver/chrome/chrome_desktop_impl.cc',
+        'test/chromedriver/chrome/chrome_desktop_impl.h',
+        'test/chromedriver/chrome/chrome_finder.cc',
+        'test/chromedriver/chrome/chrome_finder.h',
+        'test/chromedriver/chrome/chrome_finder_mac.mm',
+        'test/chromedriver/chrome/chrome_impl.cc',
+        'test/chromedriver/chrome/chrome_impl.h',
+        'test/chromedriver/chrome/console_logger.cc',
+        'test/chromedriver/chrome/console_logger.h',
+        'test/chromedriver/chrome/device_manager.cc',
+        'test/chromedriver/chrome/device_manager.h',
+        'test/chromedriver/chrome/devtools_client.h',
+        'test/chromedriver/chrome/devtools_client_impl.cc',
+        'test/chromedriver/chrome/devtools_client_impl.h',
+        'test/chromedriver/chrome/devtools_event_listener.cc',
+        'test/chromedriver/chrome/devtools_event_listener.h',
+        'test/chromedriver/chrome/devtools_http_client.cc',
+        'test/chromedriver/chrome/devtools_http_client.h',
+        'test/chromedriver/chrome/dom_tracker.cc',
+        'test/chromedriver/chrome/dom_tracker.h',
+        'test/chromedriver/chrome/frame_tracker.cc',
+        'test/chromedriver/chrome/frame_tracker.h',
+        'test/chromedriver/chrome/geolocation_override_manager.cc',
+        'test/chromedriver/chrome/geolocation_override_manager.h',
+        'test/chromedriver/chrome/geoposition.h',
+        'test/chromedriver/chrome/javascript_dialog_manager.cc',
+        'test/chromedriver/chrome/javascript_dialog_manager.h',
+        'test/chromedriver/chrome/log.h',
+        'test/chromedriver/chrome/log.cc',
+        'test/chromedriver/chrome/navigation_tracker.cc',
+        'test/chromedriver/chrome/navigation_tracker.h',
+        'test/chromedriver/chrome/performance_logger.h',
+        'test/chromedriver/chrome/performance_logger.cc',
+        'test/chromedriver/chrome/status.cc',
+        'test/chromedriver/chrome/status.h',
+        'test/chromedriver/chrome/ui_events.cc',
+        'test/chromedriver/chrome/ui_events.h',
+        'test/chromedriver/chrome/version.cc',
+        'test/chromedriver/chrome/version.h',
+        'test/chromedriver/chrome/web_view.h',
+        'test/chromedriver/chrome/web_view_impl.cc',
+        'test/chromedriver/chrome/web_view_impl.h',
+        'test/chromedriver/chrome/zip.cc',
+        'test/chromedriver/chrome/zip.h',
+        'test/chromedriver/chrome/zip_internal.cc',
+        'test/chromedriver/chrome/zip_internal.h',
+        'test/chromedriver/chrome/zip_reader.cc',
+        'test/chromedriver/chrome/zip_reader.h',
+        'test/chromedriver/net/adb_client_socket.cc',
+        'test/chromedriver/net/adb_client_socket.h',
+        'test/chromedriver/net/net_util.cc',
+        'test/chromedriver/net/net_util.h',
+        'test/chromedriver/net/sync_websocket.h',
+        'test/chromedriver/net/sync_websocket_factory.cc',
+        'test/chromedriver/net/sync_websocket_factory.h',
+        'test/chromedriver/net/sync_websocket_impl.cc',
+        'test/chromedriver/net/sync_websocket_impl.h',
+        'test/chromedriver/net/url_request_context_getter.cc',
+        'test/chromedriver/net/url_request_context_getter.h',
+        'test/chromedriver/net/websocket.cc',
+        'test/chromedriver/net/websocket.h',
+      ],
+      'actions': [
+        {
+          'action_name': 'embed_js_in_cpp',
+          'inputs': [
+            'test/chromedriver/cpp_source.py',
+            'test/chromedriver/embed_js_in_cpp.py',
+            'test/chromedriver/js/add_cookie.js',
+            'test/chromedriver/js/call_function.js',
+            'test/chromedriver/js/dispatch_context_menu_event.js',
+            'test/chromedriver/js/execute_async_script.js',
+            'test/chromedriver/js/focus.js',
+            'test/chromedriver/js/get_element_region.js',
+            'test/chromedriver/js/is_option_element_toggleable.js',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h',
+          ],
+          'action': [ 'python',
+                      'test/chromedriver/embed_js_in_cpp.py',
+                      '--directory',
+                      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
+                      'test/chromedriver/js/add_cookie.js',
+                      'test/chromedriver/js/call_function.js',
+                      'test/chromedriver/js/dispatch_context_menu_event.js',
+                      'test/chromedriver/js/execute_async_script.js',
+                      'test/chromedriver/js/focus.js',
+                      'test/chromedriver/js/get_element_region.js',
+                      'test/chromedriver/js/is_option_element_toggleable.js',
+          ],
+          'message': 'Generating sources for embedding js in chromedriver',
+        },
+        {
+          'action_name': 'embed_user_data_dir_in_cpp',
+          'inputs': [
+            'test/chromedriver/cpp_source.py',
+            'test/chromedriver/embed_user_data_dir_in_cpp.py',
+            'test/chromedriver/chrome/preferences.txt',
+            'test/chromedriver/chrome/local_state.txt',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h',
+          ],
+          'action': [ 'python',
+                      'test/chromedriver/embed_user_data_dir_in_cpp.py',
+                      '--directory',
+                      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
+                      'test/chromedriver/chrome/preferences.txt',
+                      'test/chromedriver/chrome/local_state.txt',
+          ],
+          'message': 'Generating sources for embedding user data dir in chromedriver',
+        },
+        {
+          'action_name': 'embed_extension_in_cpp',
+          'inputs': [
+            'test/chromedriver/cpp_source.py',
+            'test/chromedriver/embed_extension_in_cpp.py',
+            'test/chromedriver/extension/background.js',
+            'test/chromedriver/extension/manifest.json',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.cc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.h',
+          ],
+          'action': [ 'python',
+                      'test/chromedriver/embed_extension_in_cpp.py',
+                      '--directory',
+                      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
+                      'test/chromedriver/extension/background.js',
+                      'test/chromedriver/extension/manifest.json',
+          ],
+          'message': 'Generating sources for embedding automation extension',
+        },
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4267, ],
+    },
+    # This is the new ChromeDriver based on DevTools.
+    {
+      'target_name': 'chromedriver2_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'chrome_devtools_lib',
+        '../base/base.gyp:base',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../net/net.gyp:net',
+        '../ui/ui.gyp:ui',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        '../third_party/webdriver/atoms.cc',
+        '../third_party/webdriver/atoms.h',
+        'test/chromedriver/alert_commands.cc',
+        'test/chromedriver/alert_commands.h',
+        'test/chromedriver/basic_types.cc',
+        'test/chromedriver/basic_types.h',
+        'test/chromedriver/capabilities.cc',
+        'test/chromedriver/capabilities.h',
+        'test/chromedriver/chrome_launcher.cc',
+        'test/chromedriver/chrome_launcher.h',
+        'test/chromedriver/command.h',
+        'test/chromedriver/commands.cc',
+        'test/chromedriver/commands.h',
+        'test/chromedriver/element_commands.cc',
+        'test/chromedriver/element_commands.h',
+        'test/chromedriver/element_util.cc',
+        'test/chromedriver/element_util.h',
+        'test/chromedriver/key_converter.cc',
+        'test/chromedriver/key_converter.h',
+        'test/chromedriver/keycode_text_conversion.h',
+        'test/chromedriver/keycode_text_conversion_mac.mm',
+        'test/chromedriver/keycode_text_conversion_win.cc',
+        'test/chromedriver/keycode_text_conversion_x.cc',
+        'test/chromedriver/logging.cc',
+        'test/chromedriver/logging.h',
+        'test/chromedriver/session.cc',
+        'test/chromedriver/session.h',
+        'test/chromedriver/session_commands.cc',
+        'test/chromedriver/session_commands.h',
+        'test/chromedriver/session_thread_map.h',
+        'test/chromedriver/util.cc',
+        'test/chromedriver/util.h',
+        'test/chromedriver/window_commands.cc',
+        'test/chromedriver/window_commands.h',
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4267, ],
+    },
+    {
+      'target_name': 'chromedriver2_server_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'chromedriver2_lib',
+        '../base/base.gyp:base',
+        '../net/net.gyp:http_server',
+        '../net/net.gyp:net',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/chromedriver/server/http_handler.cc',
+        'test/chromedriver/server/http_handler.h',
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4267, ],
+    },
+    {
+      'target_name': 'chromedriver2_server',
+      'type': 'executable',
+      'dependencies': [
+        'chromedriver2_server_lib',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/chromedriver/server/chromedriver_server.cc',
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4267, ],
+    },
+    {
+      'target_name': 'chromedriver2_unittests',
+      'type': 'executable',
+      'dependencies': [
+        'chromedriver2_lib',
+        'chromedriver2_server_lib',
+        '../base/base.gyp:base',
+        '../base/base.gyp:run_all_unittests',
+        '../net/net.gyp:http_server',
+        '../net/net.gyp:net',
+        '../testing/gtest.gyp:gtest',
+        '../ui/ui.gyp:ui',
+      ],
+      'sources': [
+        'test/chromedriver/capabilities_unittest.cc',
+        'test/chromedriver/chrome/chrome_finder_unittest.cc',
+        'test/chromedriver/chrome/console_logger_unittest.cc',
+        'test/chromedriver/chrome/device_manager_unittest.cc',
+        'test/chromedriver/chrome/devtools_client_impl_unittest.cc',
+        'test/chromedriver/chrome/devtools_http_client_unittest.cc',
+        'test/chromedriver/chrome/dom_tracker_unittest.cc',
+        'test/chromedriver/chrome/frame_tracker_unittest.cc',
+        'test/chromedriver/chrome/geolocation_override_manager_unittest.cc',
+        'test/chromedriver/chrome/javascript_dialog_manager_unittest.cc',
+        'test/chromedriver/chrome/navigation_tracker_unittest.cc',
+        'test/chromedriver/chrome/performance_logger_unittest.cc',
+        'test/chromedriver/chrome/status_unittest.cc',
+        'test/chromedriver/chrome/stub_chrome.cc',
+        'test/chromedriver/chrome/stub_chrome.h',
+        'test/chromedriver/chrome/stub_devtools_client.cc',
+        'test/chromedriver/chrome/stub_devtools_client.h',
+        'test/chromedriver/chrome/stub_web_view.cc',
+        'test/chromedriver/chrome/stub_web_view.h',
+        'test/chromedriver/chrome/web_view_impl_unittest.cc',
+        'test/chromedriver/chrome_launcher_unittest.cc',
+        'test/chromedriver/commands_unittest.cc',
+        'test/chromedriver/logging_unittest.cc',
+        'test/chromedriver/server/http_handler_unittest.cc',
+        'test/chromedriver/session_commands_unittest.cc',
+        'test/chromedriver/session_unittest.cc',
+        'test/chromedriver/util_unittest.cc',
+      ],
+      'conditions': [
+        # See http://crbug.com/162998#c4 for why this is needed.
+        ['OS=="linux" and linux_use_tcmalloc==1', {
+          'dependencies': [
+            '../base/allocator/allocator.gyp:allocator',
+          ],
+        }],
+      ],
+    },
+    # ChromeDriver2 tests that aren't run on the main buildbot. Available
+    # as an optional test type on trybots.
+    {
+      'target_name': 'chromedriver2_tests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:run_all_unittests',
+        '../net/net.gyp:http_server',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_test_support',
+        '../testing/gtest.gyp:gtest',
+        '../url/url.gyp:url_lib',
+        'chromedriver2_lib',
+      ],
+      'include_dirs': [
+        '..,'
+      ],
+      'sources': [
+        'test/chromedriver/key_converter_unittest.cc',
+        'test/chromedriver/keycode_text_conversion_unittest.cc',
+        'test/chromedriver/net/net_util_unittest.cc',
+        'test/chromedriver/net/sync_websocket_impl_unittest.cc',
+        'test/chromedriver/net/test_http_server.cc',
+        'test/chromedriver/net/test_http_server.h',
+        'test/chromedriver/net/websocket_unittest.cc',
+        'test/chromedriver/test_util.cc',
+        'test/chromedriver/test_util.h',
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4267, ],
+    },
+    {
+      # Executable that runs each browser test in a new process.
+      'target_name': 'browser_tests',
+      'type': 'executable',
+      'msvs_cygwin_shell': 0,
+      'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
+      'dependencies': [
+        'browser',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:packed_extra_resources',
+        'chrome_resources.gyp:packed_resources',
+        'common/extensions/api/api.gyp:api',
+        'renderer',
+        'test_support_common',
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
+        '../base/base.gyp:test_support_base',
+        '../components/components.gyp:autofill_content_risk_proto',
+        '../components/components.gyp:autofill_content_test_support',
+        '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_test_support',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../sync/sync.gyp:test_support_sync_api',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        '../third_party/cld/cld.gyp:cld',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',
+        '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
+        '../ui/ui.gyp:webui_test_support',
+        '../v8/tools/gyp/v8.gyp:v8',
+        # Runtime dependencies
+        '../ppapi/ppapi_internal.gyp:ppapi_tests',
+        '../third_party/mesa/mesa.gyp:osmesa',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+      ],
+      'sources': [
+        '../apps/app_restore_service_browsertest.cc',
+        '../apps/load_and_launch_browsertest.cc',
+        '../remoting/test/remote_desktop_browsertest.cc',
+        'app/breakpad_mac_stubs.mm',
+        'app/chrome_command_ids.h',
+        'app/chrome_dll.rc',
+        'app/chrome_dll_resource.h',
+        'app/chrome_version.rc.version',
+        'browser/accessibility/accessibility_extension_apitest.cc',
+        'browser/accessibility/browser_accessibility_state_browsertest.cc',
+        'browser/app_controller_mac_browsertest.mm',
+        'browser/autocomplete/autocomplete_browsertest.cc',
+        'browser/autofill/autofill_browsertest.cc',
+        'browser/autofill/autofill_driver_impl_browsertest.cc',
+        'browser/autofill/form_structure_browsertest.cc',
+        'browser/autofill/risk/fingerprint_browsertest.cc',
+        'browser/browser_encoding_browsertest.cc',
+        'browser/browsing_data/browsing_data_database_helper_browsertest.cc',
+        'browser/browsing_data/browsing_data_helper_browsertest.h',
+        'browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc',
+        'browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc',
+        'browser/browsing_data/browsing_data_remover_browsertest.cc',
+        'browser/captive_portal/captive_portal_browsertest.cc',
+        'browser/chrome_content_browser_client_browsertest.cc',
+        'browser/chrome_main_browsertest.cc',
+        'browser/chrome_plugin_browsertest.cc',
+        'browser/chrome_security_exploit_browsertest.cc',
+        'browser/chrome_switches_browsertest.cc',
+        'browser/chromeos/accessibility/accessibility_manager_browsertest.cc',
+        'browser/chromeos/accessibility/magnification_manager_browsertest.cc',
+        'browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc',
+        'browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc',
+        'browser/chromeos/cros/cros_in_process_browser_test.cc',
+        'browser/chromeos/cros/cros_in_process_browser_test.h',
+        'browser/chromeos/drive/drive_integration_service_browsertest.cc',
+        'browser/chromeos/drive/test_util.cc',
+        'browser/chromeos/drive/test_util.h',
+        'browser/chromeos/extensions/echo_private_apitest.cc',
+        'browser/chromeos/extensions/file_manager/desktop_notifications_browsertest.cc',
+        'browser/chromeos/extensions/file_manager/drive_test_util.cc',
+        'browser/chromeos/extensions/file_manager/drive_test_util.h',
+        'browser/chromeos/extensions/file_manager/event_router_browsertest.cc',
+        'browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc',
+        'browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc',
+        'browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc',
+        'browser/chromeos/extensions/file_manager/file_manager_browsertest.cc',
+        'browser/chromeos/extensions/info_private_apitest.cc',
+        'browser/chromeos/extensions/input_method_apitest_chromeos.cc',
+        'browser/chromeos/extensions/wallpaper_private_apitest.cc',
+        'browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc',
+        'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.cc',
+        'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h',
+        'browser/chromeos/login/crash_restore_browsertest.cc',
+        'browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc',
+        'browser/chromeos/login/enrollment/mock_enrollment_screen.cc',
+        'browser/chromeos/login/enrollment/mock_enrollment_screen.h',
+        'browser/chromeos/login/existing_user_controller_browsertest.cc',
+        'browser/chromeos/login/kiosk_browsertest.cc',
+        'browser/chromeos/login/login_utils_browsertest.cc',
+        'browser/chromeos/login/mock_authenticator.cc',
+        'browser/chromeos/login/mock_authenticator.h',
+        'browser/chromeos/login/screen_locker_tester.cc',
+        'browser/chromeos/login/screen_locker_tester.h',
+        'browser/chromeos/login/screens/mock_error_screen.cc',
+        'browser/chromeos/login/screens/mock_error_screen.h',
+        'browser/chromeos/login/screens/mock_eula_screen.cc',
+        'browser/chromeos/login/screens/mock_eula_screen.h',
+        'browser/chromeos/login/screens/mock_network_screen.cc',
+        'browser/chromeos/login/screens/mock_network_screen.h',
+        'browser/chromeos/login/screens/mock_screen_observer.cc',
+        'browser/chromeos/login/screens/mock_screen_observer.h',
+        'browser/chromeos/login/screens/mock_update_screen.cc',
+        'browser/chromeos/login/screens/mock_update_screen.h',
+        'browser/chromeos/login/screens/network_screen_browsertest.cc',
+        'browser/chromeos/login/screens/update_screen_browsertest.cc',
+        'browser/chromeos/login/test_login_utils.cc',
+        'browser/chromeos/login/test_login_utils.h',
+        'browser/chromeos/login/user_adding_screen_browsertest.cc',
+        'browser/chromeos/login/user_image_manager_browsertest.cc',
+        'browser/chromeos/login/wizard_controller_browsertest.cc',
+        'browser/chromeos/login/wizard_in_process_browser_test.cc',
+        'browser/chromeos/login/wizard_in_process_browser_test.h',
+        'browser/chromeos/media/media_player_browsertest.cc',
+        'browser/chromeos/memory/oom_priority_manager_browsertest.cc',
+        'browser/chromeos/policy/device_local_account_browsertest.cc',
+        'browser/chromeos/policy/device_policy_cros_browser_test.cc',
+        'browser/chromeos/policy/device_policy_cros_browser_test.h',
+        'browser/chromeos/policy/device_status_collector_browsertest.cc',
+        'browser/chromeos/policy/login_screen_default_policy_browsertest.cc',
+        'browser/chromeos/policy/policy_cert_verifier_browsertest.cc',
+        'browser/chromeos/policy/power_policy_browsertest.cc',
+        'browser/chromeos/policy/variations_service_policy_browsertest.cc',
+        'browser/chromeos/power/peripheral_battery_observer_browsertest.cc',
+        'browser/chromeos/profiles/profile_helper_browsertest.cc',
+        'browser/chromeos/screensaver/screensaver_controller_browsertest.cc',
+        'browser/chromeos/system/tray_accessibility_browsertest.cc',
+        'browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc',
+        'browser/collected_cookies_browsertest.cc',
+        'browser/content_settings/content_settings_browsertest.cc',
+        'browser/crash_recovery_browsertest.cc',
+        'browser/custom_handlers/protocol_handler_registry_browsertest.cc',
+        'browser/devtools/devtools_sanity_browsertest.cc',
+        'browser/do_not_track_browsertest.cc',
+        'browser/download/download_browsertest.cc',
+        'browser/download/download_danger_prompt_browsertest.cc',
+        'browser/download/save_page_browsertest.cc',
+        'browser/drive/fake_drive_service.cc',
+        'browser/drive/fake_drive_service.h',
+        'browser/errorpage_browsertest.cc',
+        'browser/extensions/active_tab_apitest.cc',
+        'browser/extensions/activity_log/activity_log_browsertest.cc',
+        'browser/extensions/ad_view_browsertest.cc',
+        'browser/extensions/alert_apitest.cc',
+        'browser/extensions/all_urls_apitest.cc',
+        'browser/extensions/api/activity_log_private/activity_log_private_apitest.cc',
+        'browser/extensions/api/app_window/app_window_apitest.cc',
+        'browser/extensions/api/audio/audio_apitest.cc',
+        'browser/extensions/api/autotest_private/autotest_private_apitest.cc',
+        'browser/extensions/api/bluetooth/bluetooth_apitest.cc',
+        'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc',
+        'browser/extensions/api/bookmarks/bookmark_apitest.cc',
+        'browser/extensions/api/browsing_data/browsing_data_test.cc',
+        'browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc',
+        'browser/extensions/api/command_line_private/command_line_private_apitest.cc',
+        'browser/extensions/api/commands/command_service_browsertest.cc',
+        'browser/extensions/api/content_settings/content_settings_apitest.cc',
+        'browser/extensions/api/context_menus/context_menu_apitest.cc',
+        'browser/extensions/api/cookies/cookies_apitest.cc',
+        'browser/extensions/api/debugger/debugger_apitest.cc',
+        'browser/extensions/api/debugger/debugger_extension_apitest.cc',
+        'browser/extensions/api/declarative/declarative_apitest.cc',
+        'browser/extensions/api/declarative_content/declarative_content_apitest.cc',
+        'browser/extensions/api/developer_private/developer_private_apitest.cc',
+        'browser/extensions/api/dial/dial_apitest.cc',
+        'browser/extensions/api/dns/dns_apitest.cc',
+        'browser/extensions/api/dns/mock_host_resolver_creator.cc',
+        'browser/extensions/api/dns/mock_host_resolver_creator.h',
+        'browser/extensions/api/downloads/downloads_api_browsertest.cc',
+        'browser/extensions/api/extension_action/browser_action_apitest.cc',
+        'browser/extensions/api/extension_action/page_action_apitest.cc',
+        'browser/extensions/api/extension_action/page_as_browser_action_apitest.cc',
+        'browser/extensions/api/extension_action/script_badge_apitest.cc',
+        'browser/extensions/api/file_system/file_system_apitest.cc',
+        'browser/extensions/api/font_settings/font_settings_apitest.cc',
+        'browser/extensions/api/history/history_apitest.cc',
+        'browser/extensions/api/i18n/i18n_apitest.cc',
+        'browser/extensions/api/identity/experimental_identity_apitest.cc',
+        'browser/extensions/api/identity/identity_apitest.cc',
+        'browser/extensions/api/idle/idle_apitest.cc',
+        'browser/extensions/api/idltest/idltest_apitest.cc',
+        'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
+        'browser/extensions/api/management/management_api_browsertest.cc',
+        'browser/extensions/api/management/management_apitest.cc',
+        'browser/extensions/api/management/management_browsertest.cc',
+        'browser/extensions/api/media_galleries/media_galleries_apitest.cc',
+        'browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc',
+        'browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc',
+        'browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc',
+        'browser/extensions/api/messaging/native_messaging_apitest.cc',
+        'browser/extensions/api/metrics_private/metrics_apitest.cc',
+        'browser/extensions/api/module/module_apitest.cc',
+        'browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc',
+        'browser/extensions/api/networking_private/networking_private_apitest.cc',
+        'browser/extensions/api/notifications/notifications_apitest.cc',
+        'browser/extensions/api/omnibox/omnibox_api_browsertest.cc',
+        'browser/extensions/api/page_capture/page_capture_apitest.cc',
+        'browser/extensions/api/permissions/permissions_apitest.cc',
+        'browser/extensions/api/preference/preference_apitest.cc',
+        'browser/extensions/api/processes/processes_apitest.cc',
+        'browser/extensions/api/proxy/proxy_apitest.cc',
+        'browser/extensions/api/push_messaging/push_messaging_apitest.cc',
+        'browser/extensions/api/push_messaging/push_messaging_canary_test.cc',
+        'browser/extensions/api/push_messaging/sync_setup_helper.cc',
+        'browser/extensions/api/rtc_private/rtc_private_apitest.cc',
+        'browser/extensions/api/runtime/runtime_apitest.cc',
+        'browser/extensions/api/serial/serial_apitest.cc',
+        'browser/extensions/api/session_restore/session_restore_apitest.cc',
+        'browser/extensions/api/socket/socket_apitest.cc',
+        'browser/extensions/api/storage/settings_apitest.cc',
+        'browser/extensions/api/streams_private/streams_private_apitest.cc',
+        'browser/extensions/api/sync_file_system/sync_file_system_apitest.cc',
+        'browser/extensions/api/system_indicator/system_indicator_apitest.cc',
+        'browser/extensions/api/system_cpu/system_cpu_apitest.cc',
+        'browser/extensions/api/system_display/system_display_apitest.cc',
+        'browser/extensions/api/system_memory/system_memory_apitest.cc',
+        'browser/extensions/api/system_private/system_private_apitest.cc',
+        'browser/extensions/api/system_storage/storage_api_test_util.cc',
+        'browser/extensions/api/system_storage/storage_api_test_util.h',
+        'browser/extensions/api/system_storage/system_storage_apitest.cc',
+        'browser/extensions/api/system_storage/system_storage_eject_apitest.cc',
+        'browser/extensions/api/tab_capture/tab_capture_apitest.cc',
+        'browser/extensions/api/tabs/tabs_test.cc',
+        'browser/extensions/api/terminal/terminal_private_apitest.cc',
+        'browser/extensions/api/test/apitest_apitest.cc',
+        'browser/extensions/api/top_sites/top_sites_apitest.cc',
+        'browser/extensions/api/usb/usb_apitest.cc',
+        'browser/extensions/api/usb/usb_manual_apitest.cc',
+        'browser/extensions/api/web_navigation/web_navigation_apitest.cc',
+        'browser/extensions/api/web_request/web_request_apitest.cc',
+        'browser/extensions/api/webstore_private/webstore_private_apitest.cc',
+        'browser/extensions/app_background_page_apitest.cc',
+        'browser/extensions/app_process_apitest.cc',
+        'browser/extensions/background_app_browsertest.cc',
+        'browser/extensions/background_page_apitest.cc',
+        'browser/extensions/background_scripts_apitest.cc',
+        'browser/extensions/chrome_app_api_browsertest.cc',
+        'browser/extensions/content_script_apitest.cc',
+        'browser/extensions/content_security_policy_apitest.cc',
+        'browser/extensions/convert_web_app_browsertest.cc',
+        'browser/extensions/crazy_extension_browsertest.cc',
+        'browser/extensions/cross_origin_xhr_apitest.cc',
+        'browser/extensions/crx_installer_browsertest.cc',
+        'browser/extensions/docs/examples/apps/calculator_browsertest.cc',
+        'browser/extensions/events_apitest.cc',
+        'browser/extensions/execute_script_apitest.cc',
+        'browser/extensions/extension_apitest.cc',
+        'browser/extensions/extension_apitest.h',
+        'browser/extensions/extension_bindings_apitest.cc',
+        'browser/extensions/extension_blacklist_browsertest.cc',
+        'browser/extensions/extension_browsertest.cc',
+        'browser/extensions/extension_browsertest.h',
+        'browser/extensions/extension_context_menu_browsertest.cc',
+        'browser/extensions/extension_disabled_ui_browsertest.cc',
+        'browser/extensions/extension_dom_clipboard_apitest.cc',
+        'browser/extensions/extension_fileapi_apitest.cc',
+        'browser/extensions/extension_functional_browsertest.cc',
+        'browser/extensions/extension_function_test_utils.cc',
+        'browser/extensions/extension_function_test_utils.h',
+        'browser/extensions/extension_geolocation_apitest.cc',
+        'browser/extensions/extension_get_views_apitest.cc',
+        'browser/extensions/extension_icon_source_apitest.cc',
+        'browser/extensions/extension_incognito_apitest.cc',
+        'browser/extensions/extension_install_ui_browsertest.cc',
+        'browser/extensions/extension_javascript_url_apitest.cc',
+        'browser/extensions/extension_loading_browsertest.cc',
+        'browser/extensions/extension_messages_apitest.cc',
+        'browser/extensions/extension_override_apitest.cc',
+        'browser/extensions/extension_resource_request_policy_apitest.cc',
+        'browser/extensions/extension_startup_browsertest.cc',
+        'browser/extensions/extension_storage_apitest.cc',
+        'browser/extensions/extension_tabs_apitest.cc',
+        'browser/extensions/extension_test_message_listener.cc',
+        'browser/extensions/extension_test_message_listener.h',
+        'browser/extensions/extension_toolbar_model_browsertest.cc',
+        'browser/extensions/extension_url_rewrite_browsertest.cc',
+        'browser/extensions/extension_websocket_apitest.cc',
+        'browser/extensions/gpu_browsertest.cc',
+        'browser/extensions/isolated_app_browsertest.cc',
+        'browser/extensions/lazy_background_page_apitest.cc',
+        'browser/extensions/lazy_background_page_test_util.h',
+        'browser/extensions/mutation_observers_apitest.cc',
+        'browser/extensions/options_page_apitest.cc',
+        'browser/extensions/page_action_browsertest.cc',
+        'browser/extensions/platform_app_browsertest.cc',
+        'browser/extensions/platform_app_browsertest_util.cc',
+        'browser/extensions/platform_app_browsertest_util.h',
+        'browser/extensions/plugin_apitest.cc',
+        'browser/extensions/process_management_browsertest.cc',
+        'browser/extensions/requirements_checker_browsertest.cc',
+        'browser/extensions/sandboxed_pages_apitest.cc',
+        'browser/extensions/shared_module_apitest.cc',
+        'browser/extensions/startup_helper_browsertest.cc',
+        'browser/extensions/stubs_apitest.cc',
+        'browser/extensions/subscribe_page_action_browsertest.cc',
+        'browser/extensions/test_extension_dir.cc',
+        'browser/extensions/test_extension_dir.h',
+        'browser/extensions/window_controls_browsertest.cc',
+        'browser/extensions/web_contents_browsertest.cc',
+        'browser/extensions/web_view_browsertest.cc',
+        'browser/extensions/webstore_startup_installer_browsertest.cc',
+        'browser/extensions/window_open_apitest.cc',
+        'browser/external_extension_browsertest.cc',
+        'browser/fast_shutdown_browsertest.cc',
+        'browser/first_run/first_run_browsertest.cc',
+        'browser/first_run/try_chrome_dialog_view_browsertest.cc',
+        'browser/geolocation/access_token_store_browsertest.cc',
+        'browser/geolocation/geolocation_browsertest.cc',
+        'browser/history/history_browsertest.cc',
+        'browser/history/multipart_browsertest.cc',
+        'browser/history/redirect_browsertest.cc',
+        'browser/iframe_browsertest.cc',
+        'browser/importer/firefox_importer_browsertest.cc',
+        'browser/importer/ie_importer_browsertest_win.cc',
+        'browser/importer/importer_unittest_utils.cc',
+        'browser/importer/importer_unittest_utils.h',
+        'browser/infobars/infobar_extension_apitest.cc',
+        'browser/infobars/infobars_browsertest.cc',
+        'browser/loadtimes_extension_bindings_browsertest.cc',
+        'browser/locale_tests_browsertest.cc',
+        'browser/logging_chrome_browsertest.cc',
+        'browser/managed_mode/managed_mode_browsertest.cc',
+        'browser/managed_mode/managed_mode_resource_throttle_browsertest.cc',
+        'browser/managed_mode/managed_user_service_browsertest.cc',
+        'browser/media/chrome_media_stream_infobar_browsertest.cc',
+        'browser/media/chrome_webrtc_browsertest.cc',
+        'browser/media/chrome_webrtc_audio_quality_browsertest.cc',
+        'browser/media/chrome_webrtc_video_quality_browsertest.cc',
+        'browser/media/webrtc_browsertest_base.cc',
+        'browser/media/webrtc_browsertest_base.h',
+        'browser/media/webrtc_browsertest_common.cc',
+        'browser/media_galleries/fileapi/itunes_finder_win_browsertest.cc',
+        'browser/media_galleries/fileapi/media_file_validator_browsertest.cc',
+        'browser/media_galleries/media_galleries_dialog_controller_mock.cc',
+        'browser/media_galleries/media_galleries_dialog_controller_mock.h',
+        'browser/metrics/metrics_service_browsertest.cc',
+        'browser/net/cookie_policy_browsertest.cc',
+        'browser/net/dns_probe_browsertest.cc',
+        'browser/net/ftp_browsertest.cc',
+        'browser/net/load_timing_browsertest.cc',
+        'browser/net/predictor_browsertest.cc',
+        'browser/net/proxy_browsertest.cc',
+        'browser/net/websocket_browsertest.cc',
+        'browser/notifications/message_center_notifications_browsertest.cc',
+        'browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc',
+        'browser/notifications/sync_notifier/notification_bitmap_fetcher_browsertest.cc',
+        'browser/notifications/sync_notifier/sync_notifier_test_utils.cc',
+        'browser/notifications/sync_notifier/sync_notifier_test_utils.h',
+        'browser/page_cycler/page_cycler_browsertest.cc',
+        'browser/password_manager/password_manager_browsertest.cc',
+        'browser/performance_monitor/performance_monitor_browsertest.cc',
+        'browser/policy/cloud/cloud_policy_browsertest.cc',
+        'browser/policy/cloud/cloud_policy_manager_browsertest.cc',
+        'browser/policy/cloud/component_cloud_policy_browsertest.cc',
+        'browser/policy/cloud/device_management_service_browsertest.cc',
+        'browser/policy/cloud/test_request_interceptor.cc',
+        'browser/policy/cloud/test_request_interceptor.h',
+        'browser/policy/mock_policy_service.cc',
+        'browser/policy/mock_policy_service.h',
+        'browser/policy/policy_browsertest.cc',
+        'browser/policy/policy_prefs_browsertest.cc',
+        'browser/policy/test_utils.cc',
+        'browser/policy/test_utils.h',
+        'browser/prefs/pref_functional_browsertest.cc',
+        'browser/prefs/pref_service_browsertest.cc',
+        'browser/prefs/synced_pref_change_registrar_browsertest.cc',
+        'browser/prerender/prefetch_browsertest.cc',
+        'browser/prerender/prerender_browsertest.cc',
+        'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
+        'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
+        'browser/printing/print_preview_dialog_controller_browsertest.cc',
+        'browser/printing/printing_layout_browsertest.cc',
+        'browser/process_singleton_browsertest.cc',
+        'browser/profiles/avatar_menu_model_browsertest.cc',
+        'browser/profiles/profile_browsertest.cc',
+        'browser/profiles/profile_manager_browsertest.cc',
+        'browser/profile_resetter/profile_resetter_browsertest.cc',
+        'browser/referrer_policy_browsertest.cc',
+        'browser/renderer_host/render_process_host_chrome_browsertest.cc',
+        'browser/renderer_host/web_cache_manager_browsertest.cc',
+        'browser/repost_form_warning_browsertest.cc',
+        'browser/rlz/rlz_extension_apitest.cc',
+        'browser/safe_browsing/local_safebrowsing_test_server.cc',
+        'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
+        'browser/safe_browsing/safe_browsing_service_browsertest.cc',
+        'browser/safe_browsing/safe_browsing_test.cc',
+        'browser/service/service_process_control_browsertest.cc',
+        'browser/sessions/better_session_restore_browsertest.cc',
+        'browser/sessions/persistent_tab_restore_service_browsertest.cc',
+        'browser/sessions/session_restore_browsertest.cc',
+        'browser/sessions/tab_restore_browsertest.cc',
+        'browser/signin/signin_browsertest.cc',
+        'browser/speech/extension_api/tts_extension_apitest.cc',
+        'browser/speech/speech_recognition_bubble_browsertest.cc',
+        'browser/spellchecker/spellcheck_service_browsertest.cc',
+        'browser/ssl/ssl_browser_tests.cc',
+        'browser/ssl/ssl_client_certificate_selector_test.cc',
+        'browser/ssl/ssl_client_certificate_selector_test.h',
+        'browser/sync_file_system/mock_local_change_processor.cc',
+        'browser/sync_file_system/mock_local_change_processor.h',
+        'browser/sync_file_system/mock_remote_file_sync_service.cc',
+        'browser/sync_file_system/mock_remote_file_sync_service.h',
+        'browser/tab_contents/render_view_context_menu_browsertest.cc',
+        'browser/tab_contents/render_view_context_menu_browsertest_util.cc',
+        'browser/tab_contents/render_view_context_menu_browsertest_util.h',
+        'browser/tab_contents/render_view_context_menu_test_util.cc',
+        'browser/tab_contents/render_view_context_menu_test_util.h',
+        'browser/tab_contents/spellchecker_submenu_observer_browsertest.cc',
+        'browser/tab_contents/spelling_menu_observer_browsertest.cc',
+        'browser/tab_contents/view_source_browsertest.cc',
+        'browser/task_manager/task_manager_browsertest.cc',
+        'browser/task_manager/task_manager_browsertest_util.cc',
+        'browser/task_manager/task_manager_browsertest_util.h',
+        'browser/task_manager/task_manager_notification_browsertest.cc',
+        'browser/themes/theme_service_browsertest.cc',
+        'browser/translate/translate_browsertest.cc',
+        'browser/translate/translate_manager_browsertest.cc',
+        'browser/ui/app_list/app_list_controller_browsertest.cc',
+        'browser/ui/app_list/app_list_service_mac_browsertest.mm',
+        'browser/ui/app_list/search/webstore_provider_browsertest.cc',
+        'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
+        'browser/ui/ash/chrome_shell_delegate_browsertest.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc',
+        'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
+        'browser/ui/ash/shelf_browsertest.cc',
+        'browser/ui/ash/volume_controller_browsertest_chromeos.cc',
+        'browser/ui/autofill/autofill_dialog_controller_browsertest.cc',
+        'browser/ui/autofill/autofill_popup_controller_browsertest.cc',
+        'browser/ui/blocked_content/popup_blocker_browsertest.cc',
+        'browser/ui/bookmarks/bookmark_browsertest.cc',
+        'browser/ui/browser_browsertest.cc',
+        'browser/ui/browser_close_browsertest.cc',
+        'browser/ui/browser_command_controller_browsertest.cc',
+        'browser/ui/browser_navigator_browsertest.cc',
+        'browser/ui/browser_navigator_browsertest.h',
+        'browser/ui/browser_navigator_browsertest_chromeos.cc',
+        'browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm',
+        'browser/ui/cocoa/applescript/window_applescript_test.mm',
+        'browser/ui/cocoa//autofill/autofill_dialog_cocoa_browsertest.mm',
+        'browser/ui/cocoa/browser_window_cocoa_browsertest.mm',
+        'browser/ui/cocoa/browser_window_controller_browsertest.mm',
+        'browser/ui/cocoa/certificate_viewer_mac_browsertest.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm',
+        'browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm',
+        'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm',
+        'browser/ui/cocoa/dev_tools_controller_browsertest.mm',
+        'browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm',
+        'browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm',
+        'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h',
+        'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm',
+        'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_browsertest.mm',
+        'browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm',
+        'browser/ui/cocoa/omnibox/omnibox_view_mac_browsertest.mm',
+        'browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm',
+        'browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm',
+        'browser/ui/cocoa/profile_signin_confirmation_view_controller_browsertest.mm',
+        'browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm',
+        'browser/ui/cocoa/view_id_util_browsertest.mm',
+        'browser/ui/find_bar/find_bar_host_browsertest.cc',
+        'browser/ui/fullscreen/fullscreen_controller_browsertest.cc',
+        'browser/ui/global_error/global_error_service_browsertest.cc',
+        'browser/ui/gtk/bubble/bubble_gtk_browsertest.cc',
+        'browser/ui/gtk/confirm_bubble_gtk_browsertest.cc',
+        'browser/ui/gtk/location_bar_view_gtk_browsertest.cc',
+        'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc',
+        'browser/ui/gtk/view_id_util_browsertest.cc',
+        'browser/ui/login/login_prompt_browsertest.cc',
+        'browser/ui/panels/panel_extension_browsertest.cc',
+        'browser/ui/prefs/prefs_tab_helper_browsertest.cc',
+        'browser/ui/startup/startup_browser_creator_browsertest.cc',
+        'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc',
+        'browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc',
+        'browser/ui/tab_modal_confirm_dialog_browsertest.cc',
+        'browser/ui/tab_modal_confirm_dialog_browsertest.h',
+        'browser/ui/toolbar/test_toolbar_model.cc',
+        'browser/ui/toolbar/test_toolbar_model.h',
+        'browser/ui/views/app_list/app_list_controller_win_browsertest.cc',
+        'browser/ui/views/avatar_menu_button_browsertest.cc',
+        'browser/ui/views/browser_actions_container_browsertest.cc',
+        'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc',
+        'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
+        'browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc',
+        'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
+        'browser/ui/views/select_file_dialog_extension_browsertest.cc',
+        'browser/ui/views/toolbar_view_browsertest.cc',
+        'browser/ui/views/web_dialog_view_browsertest.cc',
+        'browser/ui/webui/bidi_checker_web_ui_test.cc',
+        'browser/ui/webui/bidi_checker_web_ui_test.h',
+        'browser/ui/webui/bookmarks_ui_browsertest.cc',
+        'browser/ui/webui/chrome_url_data_manager_browsertest.cc',
+        'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc',
+        'browser/ui/webui/downloads_dom_handler_browsertest.cc',
+        'browser/ui/webui/extensions/chromeos/kiosk_apps_browsertest.js',
+        'browser/ui/webui/extensions/extension_settings_browsertest.js',
+        'browser/ui/webui/help/help_browsertest.js',
+        'browser/ui/webui/identity_internals_ui_browsertest.cc',
+        'browser/ui/webui/identity_internals_ui_browsertest.h',
+        'browser/ui/webui/identity_internals_ui_browsertest.js',
+        'browser/ui/webui/inspect_ui_browsertest.cc',
+        'browser/ui/webui/net_internals/net_internals_ui_browsertest.cc',
+        'browser/ui/webui/net_internals/net_internals_ui_browsertest.h',
+        'browser/ui/webui/ntp/most_visited_browsertest.cc',
+        'browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc',
+        'browser/ui/webui/ntp/new_tab_ui_browsertest.cc',
+        'browser/ui/webui/options/autofill_options_browsertest.js',
+        'browser/ui/webui/options/browser_options_browsertest.js',
+        'browser/ui/webui/options/certificate_manager_browsertest.cc',
+        'browser/ui/webui/options/certificate_manager_browsertest.js',
+        'browser/ui/webui/options/chromeos/accounts_options_browsertest.js',
+        'browser/ui/webui/options/chromeos/bluetooth_options_browsertest.js',
+        'browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc',
+        'browser/ui/webui/options/content_options_browsertest.js',
+        'browser/ui/webui/options/content_settings_exception_area_browsertest.js',
+        'browser/ui/webui/options/cookies_view_browsertest.js',
+        'browser/ui/webui/options/edit_dictionary_browsertest.js',
+        'browser/ui/webui/options/font_settings_browsertest.js',
+        'browser/ui/webui/options/language_options_browsertest.js',
+        'browser/ui/webui/options/language_options_dictionary_download_browsertest.js',
+        'browser/ui/webui/options/manage_profile_browsertest.js',
+        'browser/ui/webui/options/options_browsertest.cc',
+        'browser/ui/webui/options/options_browsertest.js',
+        'browser/ui/webui/options/options_ui_browsertest.cc',
+        'browser/ui/webui/options/options_ui_browsertest.h',
+        'browser/ui/webui/options/password_manager_browsertest.js',
+        'browser/ui/webui/options/profile_settings_reset_browsertest.js',
+        'browser/ui/webui/options/preferences_browsertest.cc',
+        'browser/ui/webui/options/preferences_browsertest.h',
+        'browser/ui/webui/options/search_engine_manager_browsertest.js',
+        'browser/ui/webui/options/settings_app_browsertest.js',
+        'browser/ui/webui/options/settings_format_browsertest.js',
+        'browser/ui/webui/policy_ui_browsertest.cc',
+        'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc',
+        'browser/ui/webui/sync_setup_browsertest.js',
+        'browser/ui/webui/web_ui_test_handler.cc',
+        'browser/ui/webui/web_ui_test_handler.h',
+        'browser/user_data_dir_extractor_win_browsertest.cc',
+        'browser/unload_browsertest.cc',
+        'common/mac/mock_launchd.cc',
+        'common/mac/mock_launchd.h',
+        'common/time_format_browsertest.cc',
+        'renderer/autofill/autofill_renderer_browsertest.cc',
+        'renderer/autofill/form_autocomplete_browsertest.cc',
+        'renderer/autofill/form_autofill_browsertest.cc',
+        'renderer/autofill/page_click_tracker_browsertest.cc',
+        'renderer/autofill/password_autofill_agent_browsertest.cc',
+        'renderer/autofill/password_generation_manager_browsertest.cc',
+        'renderer/content_settings_observer_browsertest.cc',
+        'renderer/printing/print_web_view_helper_browsertest.cc',
+        'renderer/safe_browsing/malware_dom_details_browsertest.cc',
+        'renderer/safe_browsing/phishing_classifier_browsertest.cc',
+        'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
+        'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
+        'renderer/translate/translate_helper_browsertest.cc',
+        'test/base/chrome_render_view_test.cc',
+        'test/base/chrome_render_view_test.h',
+        'test/base/chrome_test_launcher.cc',
+        'test/base/web_ui_browsertest.cc',
+        'test/base/web_ui_browsertest.h',
+        'test/data/chromeos/oobe_webui_browsertest.js',
+        'test/base/in_process_browser_test_browsertest.cc',
+        'test/base/tracing_browsertest.cc',
+        'test/base/test_chrome_web_ui_controller_factory.cc',
+        'test/base/test_chrome_web_ui_controller_factory.h',
+        'test/base/test_chrome_web_ui_controller_factory_browsertest.cc',
+        'test/data/webui/accessibility_audit_browsertest.js',
+        'test/data/webui/assertions.js',
+        'test/data/webui/async_gen.cc',
+        'test/data/webui/async_gen.h',
+        'test/data/webui/async_gen.js',
+        'test/data/webui/certificate_viewer_dialog_test.js',
+        'test/data/webui/certificate_viewer_ui_test-inl.h',
+        'test/data/webui/chrome_send_browsertest.cc',
+        'test/data/webui/chrome_send_browsertest.h',
+        'test/data/webui/chrome_send_browsertest.js',
+        'test/data/webui/history_browsertest.js',
+        'test/data/webui/history_ui_browsertest.cc',
+        'test/data/webui/history_ui_browsertest.h',
+        'test/data/webui/mock4js_browsertest.js',
+        'test/data/webui/net_internals/bandwidth_view.js',
+        'test/data/webui/net_internals/dns_view.js',
+        'test/data/webui/net_internals/events_view.js',
+        'test/data/webui/net_internals/hsts_view.js',
+        'test/data/webui/net_internals/http_pipeline_view.js',
+        'test/data/webui/net_internals/log_util.js',
+        'test/data/webui/net_internals/log_view_painter.js',
+        'test/data/webui/net_internals/main.js',
+        'test/data/webui/net_internals/net_internals_test.js',
+        'test/data/webui/net_internals/prerender_view.js',
+        'test/data/webui/net_internals/test_view.js',
+        'test/data/webui/net_internals/timeline_view.js',
+        'test/data/webui/ntp4.js',
+        'test/data/webui/ntp4_browsertest.cc',
+        'test/data/webui/ntp4_browsertest.h',
+        'test/data/webui/print_preview.cc',
+        'test/data/webui/print_preview.h',
+        'test/data/webui/print_preview.js',
+        'test/data/webui/sandboxstatus_browsertest.js',
+        'test/data/webui/webui_resource_browsertest.cc',
+        'test/gpu/gpu_feature_browsertest.cc',
+        'test/gpu/webgl_infobar_browsertest.cc',
+        'test/ppapi/ppapi_browsertest.cc',
+        'test/security_tests/sandbox_browsertest_linux.cc',
+        'test/security_tests/sandbox_browsertest_win.cc',
+        # TODO(craig): Rename this and run from base_unittests when the test
+        # is safe to run there. See http://crbug.com/78722 for details.
+        '../base/files/file_path_watcher_browsertest.cc',
+      ],
+      'rules': [
+        {
+          'rule_name': 'js2webui',
+          'extension': 'js',
+          'msvs_external_rule': 1,
+          'inputs': [
+            '<(gypv8sh)',
+            '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
+            '<(mock_js)',
+            '<(accessibility_audit_js)',
+            '<(test_api_js)',
+            '<(js2gtest)',
+          ],
+          'outputs': [
+            '<(INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-gen.cc',
+            '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
+          ],
+          'process_outputs_as_sources': 1,
+          'action': [
+            'python',
+            '<@(_inputs)',
+            'webui',
+            '<(RULE_INPUT_PATH)',
+            'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
+            '<@(_outputs)',
+          ],
+        },
+      ],
+      'conditions': [
+        ['enable_one_click_signin==0', {
+          'sources!': [
+            'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc',
+            'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc',
+          ]
+        }],
+        ['disable_nacl==0', {
+          'sources':[
+            'browser/extensions/extension_nacl_browsertest.cc',
+            'browser/nacl_host/test/gdb_debug_stub_browsertest.cc',
+          ],
+          'dependencies': [
+            # Runtime dependency.
+            '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
+          ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {
+              'sources': [
+                'test/nacl/nacl_browsertest.cc',
+                'test/nacl/nacl_browsertest_uma.cc',
+                'test/nacl/nacl_browsertest_util.cc',
+                'test/nacl/nacl_browsertest_util.h',
+              ],
+              'dependencies': [
+                'test/data/extensions/api_test/api_test_data.gyp:socket_ppapi',
+                'test/data/nacl/nacl_test_data.gyp:*',
+                '../ppapi/native_client/native_client.gyp:nacl_irt',
+                '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests',
+              ],
+            }],
+            ['OS=="win" or OS=="linux"', {
+              'sources': [
+                'browser/nacl_host/test/nacl_gdb_browsertest.cc',
+              ],
+              'dependencies': [
+                'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb',
+              ],
+            }],
+            ['OS=="win"', {
+              # TODO(halyavin) NaCl on Windows can't open debug stub socket
+              # in browser process as needed by this test.
+              # See http://crbug.com/157312.
+              'sources!': [
+                'browser/nacl_host/test/gdb_debug_stub_browsertest.cc',
+              ],
+              'dependencies': [
+                'chrome.gyp:chrome_nacl_win64',
+              ],
+            }],
+            ['OS=="linux"', {
+              'dependencies': [
+                '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
+                'nacl_helper',
+              ],
+            }],
+            ['chromeos==0', {
+              'sources!': [
+                'test/data/chromeos/oobe_webui_browsertest.js',
+              ],
+            }],
+          ],
+        }],
+        ['use_ash==1', {
+          'dependencies': [
+            '../ash/ash.gyp:ash_test_support',
+          ],
+        }],
+        ['chromeos==0', {
+          'sources/': [
+            ['exclude', '^browser/chromeos'],
+            ['exclude', '^browser/ui/webui/options/chromeos/'],
+          ],
+          'sources!': [
+            'browser/extensions/api/rtc_private/rtc_private_apitest.cc',
+            'browser/extensions/api/terminal/terminal_private_apitest.cc',
+            'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
+            'test/data/webui/certificate_viewer_dialog_test.js',
+            'test/data/webui/certificate_viewer_ui_test-inl.h',
+          ],
+        }, { # chromeos==1
+          'sources!': [
+            '../apps/load_and_launch_browsertest.cc',
+            'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
+            'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
+            'browser/service/service_process_control_browsertest.cc',
+            'browser/signin/signin_browsertest.cc',
+            # chromeos does not use cross-platform panels
+            'browser/ui/panels/panel_extension_browsertest.cc',
+          ],
+          'dependencies': [
+            '../dbus/dbus.gyp:dbus_test_support',
+            '../build/linux/system.gyp:dbus',
+          ],
+        }],
+        ['file_manager_extension==0', {
+          'sources!': [
+            'browser/ui/views/select_file_dialog_extension_browsertest.cc',
+          ],
+        }],
+        ['configuration_policy==0', {
+          'sources/': [
+            ['exclude', '^browser/policy/'],
+          ],
+          'sources!': [
+            'browser/ui/webui/policy_ui_browsertest.cc',
+            'browser/ui/webui/options/preferences_browsertest.cc',
+          ],
+        }],
+        ['input_speech==0', {
+          'sources/': [
+            ['exclude', '^browser/speech/'],
+            ['exclude', '^../content/browser/speech/'],
+          ],
+        }],
+        ['safe_browsing==1', {
+          'defines': [
+            'FULL_SAFE_BROWSING',
+          ],
+        }],
+        # TODO(sgurun) enable tests.
+        ['safe_browsing==2', {
+          'sources/': [
+            ['exclude', '^browser/safe_browsing/'],
+            ['exclude', '^renderer/safe_browsing/'],
+          ],
+        }],
+        ['safe_browsing==0', {
+          'sources/': [
+            ['exclude', '^browser/safe_browsing/'],
+            ['exclude', '^renderer/safe_browsing/'],
+          ],
+        }],
+        ['enable_captive_portal_detection!=1', {
+          'sources/': [
+            ['exclude', '^browser/captive_portal/'],
+          ],
+        }],
+        ['internal_pdf', {
+          'dependencies': [
+            '../pdf/pdf.gyp:pdf',
+          ],
+          'sources': [
+            'browser/ui/pdf/pdf_browsertest.cc',
+          ],
+        }],
+        ['OS!="linux" or toolkit_views==1', {
+          'sources!': [
+            'browser/ui/gtk/view_id_util_browsertest.cc',
+          ],
+        }],
+        ['enable_rlz==0', {
+          'sources!': [
+            'browser/rlz/rlz_extension_apitest.cc',
+          ],
+        }],
+        ['enable_webrtc==0', {
+          'sources!': [
+            'browser/media/chrome_webrtc_browsertest.cc',
+          ],
+        }],
+        ['OS=="win"', {
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'dependencies': [
+            'app_host',
+            'browser_tests_exe_pdb_workaround',
+            'chrome_version_resources',
+            'security_tests',  # run time dependency
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+          'sources!': [
+            # use_aura currently sets use_ash on Windows. So take these tests out
+            # for win aura builds.
+            # TODO: enable these for win_ash browser tests.
+            'browser/chromeos/system/tray_accessibility_browsertest.cc',
+            'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
+            'browser/ui/ash/chrome_shell_delegate_browsertest.cc',
+            'browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc',
+            'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
+            'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
+            'browser/ui/ash/shelf_browsertest.cc',
+            'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc',
+            'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
+            'browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc',
+          ],
+        }, { # else: OS != "win"
+          'sources!': [
+            'app/chrome_command_ids.h',
+            'app/chrome_dll.rc',
+            'app/chrome_dll_resource.h',
+            'app/chrome_version.rc.version',
+            # TODO(port): http://crbug.com/45770
+            'browser/printing/printing_layout_browsertest.cc',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+          'dependencies': [
+            '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['OS=="mac"', {
+          'include_dirs': [
+            '../third_party/GTM',
+          ],
+          # TODO(mark): We really want this for all non-static library
+          # targets, but when we tried to pull it up to the common.gypi
+          # level, it broke other things like the ui, startup, and
+          # page_cycler tests. *shrug*
+          'xcode_settings': {
+            'OTHER_LDFLAGS': [
+              '-Wl,-ObjC',
+            ],
+          },
+          # Other platforms only need
+          # chrome_resources.gyp:{packed_extra_resources,packed_resources},
+          # and can build this target standalone much faster.
+          'dependencies': [
+            'chrome',
+            '../components/components.gyp:breakpad_stubs',
+          ],
+          'sources': [
+            'browser/renderer_host/chrome_render_widget_host_view_mac_delegate_browsertest.cc',
+            'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc',
+          ],
+          'sources!': [
+            # TODO(groby): This test depends on hunspell and we cannot run it on
+            # Mac, which does not use hunspell by default.
+            'browser/spellchecker/spellcheck_service_browsertest.cc',
+            # TODO(rouslan): This test depends on the custom dictionary UI,
+            # which is disabled on Mac.
+            'browser/ui/webui/options/edit_dictionary_browsertest.js',
+            # TODO(rouslan): This test depends on hunspell and we cannot run it
+            # on Mac, which does use hunspell by default.
+            'browser/ui/webui/options/language_options_dictionary_download_browsertest.js',
+            # ProcessSingletonMac doesn't do anything.
+            'browser/process_singleton_browsertest.cc',
+            # This test depends on GetCommandLineForRelaunch, which is not
+            # available on Mac.
+            'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
+          ],
+        }],
+        ['OS=="mac" or OS=="win"', {
+          'sources': [
+            'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc',
+          ],
+        }],
+        ['os_posix == 0 or chromeos == 1', {
+          'sources!': [
+            'common/time_format_browsertest.cc',
+          ],
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../ui/views/views.gyp:views',
+          ],
+          'sources!': [
+            # TODO(estade): port to views.
+            'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc',
+          ],
+        }, { # else: toolkit_views == 0
+          'sources/': [
+            ['exclude', '^../ui/views/'],
+            ['exclude', '^browser/ui/views/'],
+          ],
+        }],
+        ['OS!="android" and OS!="ios"', {
+          # npapi test plugin doesn't build on android or ios
+          'dependencies': [
+            # build time dependency.
+            '../content/content.gyp:copy_npapi_test_plugin',
+            '../v8/tools/gyp/v8.gyp:v8_shell#host',
+          ],
+        }],
+        ['enable_app_list==0', {
+          'sources/': [
+            ['exclude', '^browser/ui/app_list/'],
+          ],
+        }],
+        ['enable_plugins==1', {
+          'dependencies': [
+            # Runtime dependency.
+            '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
+            '../media/media.gyp:clearkeycdmadapter',
+          ],
+        }],
+        ['enable_printing!=1', {
+          'sources/': [
+            ['exclude', '^browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc'],
+            ['exclude', '^browser/printing/cloud_print/test/.*'],
+            ['exclude', '^browser/printing/print_dialog_cloud_interative_uitest.cc'],
+            ['exclude', '^browser/printing/printing_layout_browsertest.cc'],
+            ['exclude', '^browser/printing/print_preview_dialog_controller_browsertest.cc'],
+            ['exclude', '^browser/ui/webui/print_preview/print_preview_ui_browsertest.cc'],
+            ['exclude', '^renderer/printing/print_web_view_helper_browsertest.cc'],
+            ['exclude', '^test/data/webui/print_preview.cc'],
+            ['exclude', '^test/data/webui/print_preview.h'],
+            ['exclude', '^test/data/webui/print_preview.js'],
+          ],
+        }],
+        ['enable_mdns==1', {
+          'sources' : [
+            'browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc',
+          ]
+        }],
+      ],  # conditions
+    },  # target browser_tests
+    {
+      # Executable that runs each perf browser test in a new process.
+      'target_name': 'performance_browser_tests',
+      'type': 'executable',
+      'msvs_cygwin_shell': 0,
+      'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
+      'dependencies': [
+        'browser',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:packed_extra_resources',
+        'chrome_resources.gyp:packed_resources',
+        'renderer',
+        'test_support_common',
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
+        '../base/base.gyp:test_support_base',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_test_support',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/cld/cld.gyp:cld',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../v8/tools/gyp/v8.gyp:v8',
+        # Runtime dependencies
+        '../third_party/mesa/mesa.gyp:osmesa',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+      ],
+      'sources': [
+        'app/breakpad_mac_stubs.mm',
+        'app/chrome_command_ids.h',
+        'app/chrome_dll.rc',
+        'app/chrome_dll_resource.h',
+        'app/chrome_version.rc.version',
+        'test/base/chrome_render_view_test.cc',
+        'test/base/chrome_render_view_test.h',
+        'test/base/chrome_test_launcher.cc',
+        'test/perf/browser_perf_test.cc',
+        'test/perf/browser_perf_test.h',
+        'test/perf/rendering/throughput_tests.cc',
+      ],
+      'rules': [
+        {
+          'rule_name': 'js2webui',
+          'extension': 'js',
+          'msvs_external_rule': 1,
+          'inputs': [
+            '<(gypv8sh)',
+            '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
+            '<(mock_js)',
+            '<(accessibility_audit_js)',
+            '<(test_api_js)',
+            '<(js2gtest)',
+          ],
+          'outputs': [
+            '<(INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-gen.cc',
+            '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
+          ],
+          'process_outputs_as_sources': 1,
+          'action': [
+            'python',
+            '<@(_inputs)',
+            'webui',
+            '<(RULE_INPUT_PATH)',
+            'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
+            '<@(_outputs)',
+          ],
+        },
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'dependencies': [
+            'chrome_version_resources',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+          'configurations': {
+            'Debug_Base': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_debug_link_nonincremental)',
+                },
+              },
+            },
+          }
+        }, { # else: OS != "win"
+          'sources!': [
+            'app/chrome_command_ids.h',
+            'app/chrome_dll.rc',
+            'app/chrome_dll_resource.h',
+            'app/chrome_version.rc.version',
+          ],
+        }],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+          'dependencies': [
+            '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['OS=="mac"', {
+          'include_dirs': [
+            '../third_party/GTM',
+          ],
+          # TODO(mark): We really want this for all non-static library
+          # targets, but when we tried to pull it up to the common.gypi
+          # level, it broke other things like the ui, startup, and
+          # page_cycler tests. *shrug*
+          'xcode_settings': {
+            'OTHER_LDFLAGS': [
+              '-Wl,-ObjC',
+            ],
+          },
+          # Other platforms only need
+          # chrome_resources.gyp:{packed_extra_resources,packed_resources},
+          # and can build this target standalone much faster.
+          'dependencies': [
+            'chrome',
+            '../components/components.gyp:breakpad_stubs',
+          ],
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+      ],  # conditions
+    },  # target performance_browser_tests
+    {
+      # To run the tests from page_load_test.cc on Linux, we need to:
+      #
+      #   a) Run with CHROME_HEADLESS=1 to generate crash dumps.
+      #   b) Strip the binary if it's a debug build. (binary may be over 2GB)
+      'target_name': 'reliability_tests',
+      'type': 'executable',
+      'dependencies': [
+        'browser',
+        'chrome',
+        'chrome_resources.gyp:theme_resources',
+        'test_support_common',
+        'test_support_ui',
+        'test_support_ui_runner',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/WebKit/public/blink.gyp:blink',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/reliability/page_load_test.cc',
+      ],
+      'conditions': [
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        },],
+        ['OS=="win" and win_use_allocator_shim==1', {
+          'dependencies': [
+            '<(allocator_target)',
+          ],
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                },
+              },
+            },
+          },
+        },],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        },],
+        ['OS=="linux" and enable_webrtc==1', {
+          'dependencies': [
+            # TODO(tommi): Figure out why the 32bit lucid builder fails to
+            # find this dependency for this target (other builders pick it up
+            # correctly).  crbug.com/231068.
+            '../third_party/libjingle/libjingle.gyp:libpeerconnection',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'performance_ui_tests',
+      'type': 'executable',
+      'dependencies': [
+        'chrome',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'debugger',
+        'test_support_common',
+        'test_support_ui',
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'sources': [
+        # TODO(darin): Move other UIPerfTests here.
+        'test/perf/dom_checker_uitest.cc',
+        'test/perf/feature_startup_test.cc',
+        'test/perf/frame_rate/frame_rate_tests.cc',
+        'test/perf/generate_profile.cc',
+        'test/perf/generate_profile.h',
+        'test/perf/indexeddb_uitest.cc',
+        'test/perf/memory_test.cc',
+        'test/perf/perf_ui_test_suite.cc',
+        'test/perf/run_all_perfuitests.cc',
+        'test/perf/shutdown_test.cc',
+        'test/perf/startup_test.cc',
+        'test/perf/tab_switching_test.cc',
+      ],
+      'conditions': [
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        }],
+        ['OS=="win"', {
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+          'configurations': {
+            'Debug_Base': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                },
+              },
+            },
+          },
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        }],
+        ['OS=="mac"', {
+          'sources': [
+            'test/perf/mach_ports_test.cc',
+          ],
+        }],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../ui/views/views.gyp:views',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'sync_integration_tests',
+      'type': 'executable',
+      'dependencies': [
+        'browser',
+        'chrome',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:packed_extra_resources',
+        'chrome_resources.gyp:packed_resources',
+        'common',
+        'common/extensions/api/api.gyp:api',
+        'renderer',
+        'test_support_common',
+        '../net/net.gyp:net',
+        '../printing/printing.gyp:printing',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../sync/sync.gyp:test_support_sync_testserver',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/npapi/npapi.gyp:npapi',
+        '../third_party/WebKit/public/blink.gyp:blink',
+      ],
+      'include_dirs': [
+        '..',
+        '<(INTERMEDIATE_DIR)',
+        '<(protoc_out_dir)',
+      ],
+      # TODO(phajdan.jr): Only temporary, to make transition easier.
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+      ],
+      'sources': [
+        'app/chrome_command_ids.h',
+        'app/chrome_dll.rc',
+        'app/chrome_dll_resource.h',
+        'app/chrome_version.rc.version',
+        'test/base/chrome_test_launcher.cc',
+        'test/data/resource.rc',
+        'browser/sync/test/integration/apps_helper.cc',
+        'browser/sync/test/integration/apps_helper.h',
+        'browser/sync/test/integration/autofill_helper.cc',
+        'browser/sync/test/integration/autofill_helper.h',
+        'browser/sync/test/integration/bookmarks_helper.cc',
+        'browser/sync/test/integration/bookmarks_helper.h',
+        'browser/sync/test/integration/cross_platform_sync_test.cc',
+        'browser/sync/test/integration/dictionary_helper.cc',
+        'browser/sync/test/integration/dictionary_helper.h',
+        'browser/sync/test/integration/dictionary_load_observer.cc',
+        'browser/sync/test/integration/dictionary_load_observer.h',
+        'browser/sync/test/integration/enable_disable_test.cc',
+        'browser/sync/test/integration/extension_settings_helper.cc',
+        'browser/sync/test/integration/extension_settings_helper.h',
+        'browser/sync/test/integration/extensions_helper.cc',
+        'browser/sync/test/integration/extensions_helper.h',
+        'browser/sync/test/integration/migration_errors_test.cc',
+        'browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_dictionary_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_passwords_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_preferences_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_sessions_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc',
+        'browser/sync/test/integration/passwords_helper.cc',
+        'browser/sync/test/integration/passwords_helper.h',
+        'browser/sync/test/integration/preferences_helper.cc',
+        'browser/sync/test/integration/preferences_helper.h',
+        'browser/sync/test/integration/search_engines_helper.cc',
+        'browser/sync/test/integration/search_engines_helper.h',
+        'browser/sync/test/integration/sessions_helper.cc',
+        'browser/sync/test/integration/sessions_helper.h',
+        'browser/sync/test/integration/single_client_apps_sync_test.cc',
+        'browser/sync/test/integration/single_client_bookmarks_sync_test.cc',
+        'browser/sync/test/integration/single_client_dictionary_sync_test.cc',
+        'browser/sync/test/integration/single_client_extensions_sync_test.cc',
+        'browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc',
+        'browser/sync/test/integration/single_client_passwords_sync_test.cc',
+        'browser/sync/test/integration/single_client_preferences_sync_test.cc',
+        'browser/sync/test/integration/single_client_search_engines_sync_test.cc',
+        'browser/sync/test/integration/single_client_sessions_sync_test.cc',
+        'browser/sync/test/integration/single_client_themes_sync_test.cc',
+        'browser/sync/test/integration/single_client_typed_urls_sync_test.cc',
+        'browser/sync/test/integration/sync_app_helper.cc',
+        'browser/sync/test/integration/sync_app_helper.h',
+        'browser/sync/test/integration/sync_datatype_helper.cc',
+        'browser/sync/test/integration/sync_datatype_helper.h',
+        'browser/sync/test/integration/sync_errors_test.cc',
+        'browser/sync/test/integration/sync_extension_helper.cc',
+        'browser/sync/test/integration/sync_extension_helper.h',
+        'browser/sync/test/integration/sync_test.cc',
+        'browser/sync/test/integration/sync_test.h',
+        'browser/sync/test/integration/themes_helper.cc',
+        'browser/sync/test/integration/themes_helper.h',
+        'browser/sync/test/integration/two_client_apps_sync_test.cc',
+        'browser/sync/test/integration/two_client_autofill_sync_test.cc',
+        'browser/sync/test/integration/two_client_bookmarks_sync_test.cc',
+        'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
+        'browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc',
+        'browser/sync/test/integration/two_client_extensions_sync_test.cc',
+        'browser/sync/test/integration/two_client_passwords_sync_test.cc',
+        'browser/sync/test/integration/two_client_preferences_sync_test.cc',
+        'browser/sync/test/integration/two_client_search_engines_sync_test.cc',
+        'browser/sync/test/integration/two_client_sessions_sync_test.cc',
+        'browser/sync/test/integration/two_client_themes_sync_test.cc',
+        'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
+        'browser/sync/test/integration/typed_urls_helper.cc',
+        'browser/sync/test/integration/typed_urls_helper.h',
+      ],
+      'conditions': [
+        ['toolkit_uses_gtk == 1', {
+           'dependencies': [
+             '../build/linux/system.gyp:gtk',
+           ],
+        }],
+        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+          'dependencies': [
+            '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['OS=="mac"', {
+          # The sync_integration_tests do not run on mac without this flag.
+          # Search for comments about "xcode_settings" elsewhere in this file.
+          'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+          # Dictionary sync is disabled on Mac.
+          'sources!': [
+            'browser/sync/test/integration/dictionary_helper.cc',
+            'browser/sync/test/integration/dictionary_helper.h',
+            'browser/sync/test/integration/dictionary_load_observer.cc',
+            'browser/sync/test/integration/dictionary_load_observer.h',
+            'browser/sync/test/integration/multiple_client_dictionary_sync_test.cc',
+            'browser/sync/test/integration/single_client_dictionary_sync_test.cc',
+            'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
+          ],
+        }],
+        ['OS=="win"', {
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'dependencies': [
+            'chrome_version_resources',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_debug_link_nonincremental)',
+                },
+              },
+            },
+          },
+        }, { # else: OS != "win"
+          'sources!': [
+            'app/chrome_dll.rc',
+            'app/chrome_version.rc.version',
+            'test/data/resource.rc',
+          ],
+        }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../ui/views/views.gyp:views',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'sync_performance_tests',
+      'type': 'executable',
+      'dependencies': [
+        'browser',
+        'chrome',
+        'common/extensions/api/api.gyp:api',
+        'test_support_common',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../sync/sync.gyp:test_support_sync_testserver',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '..',
+        '<(INTERMEDIATE_DIR)',
+        '<(protoc_out_dir)',
+      ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+      ],
+      'sources': [
+        'app/chrome_command_ids.h',
+        'app/chrome_dll.rc',
+        'app/chrome_dll_resource.h',
+        'app/chrome_version.rc.version',
+        'browser/sync/test/integration/autofill_helper.cc',
+        'browser/sync/test/integration/autofill_helper.h',
+        'browser/sync/test/integration/bookmarks_helper.cc',
+        'browser/sync/test/integration/bookmarks_helper.h',
+        'browser/sync/test/integration/dictionary_helper.cc',
+        'browser/sync/test/integration/dictionary_helper.h',
+        'browser/sync/test/integration/dictionary_load_observer.cc',
+        'browser/sync/test/integration/dictionary_load_observer.h',
+        'browser/sync/test/integration/extensions_helper.cc',
+        'browser/sync/test/integration/extensions_helper.h',
+        'browser/sync/test/integration/passwords_helper.cc',
+        'browser/sync/test/integration/passwords_helper.h',
+        'browser/sync/test/integration/performance/autofill_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/dictionary_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/extensions_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/sync_timing_helper.cc',
+        'browser/sync/test/integration/performance/sync_timing_helper.h',
+        'browser/sync/test/integration/performance/passwords_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/sessions_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc',
+        'browser/sync/test/integration/sessions_helper.cc',
+        'browser/sync/test/integration/sessions_helper.h',
+        'browser/sync/test/integration/sync_datatype_helper.cc',
+        'browser/sync/test/integration/sync_datatype_helper.h',
+        'browser/sync/test/integration/sync_extension_helper.cc',
+        'browser/sync/test/integration/sync_extension_helper.h',
+        'browser/sync/test/integration/sync_test.cc',
+        'browser/sync/test/integration/sync_test.h',
+        'browser/sync/test/integration/typed_urls_helper.cc',
+        'browser/sync/test/integration/typed_urls_helper.h',
+        'test/base/chrome_test_launcher.cc',
+        'test/data/resource.rc',
+      ],
+      'conditions': [
+        ['toolkit_uses_gtk == 1', {
+           'dependencies': [
+             '../build/linux/system.gyp:gtk',
+           ],
+        }],
+        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+          'dependencies': [
+            '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['OS=="mac"', {
+          # The sync_performance_tests do not run on mac without this flag.
+          # Search for comments about "xcode_settings" elsewhere in this file.
+          'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+          # Dictionary sync is disabled on Mac.
+          'sources!': [
+            'browser/sync/test/integration/dictionary_helper.cc',
+            'browser/sync/test/integration/dictionary_helper.h',
+            'browser/sync/test/integration/dictionary_load_observer.cc',
+            'browser/sync/test/integration/dictionary_load_observer.h',
+            'browser/sync/test/integration/performance/dictionary_sync_perf_test.cc',
+          ],
+        }],
+        ['OS=="win"', {
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'dependencies': [
+            'chrome_version_resources',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_debug_link_nonincremental)',
+                },
+              },
+            },
+          },
+        }, { # else: OS != "win"
+          'sources!': [
+            'app/chrome_dll.rc',
+            'app/chrome_version.rc.version',
+            'test/data/resource.rc',
+          ],
+        }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../ui/views/views.gyp:views',
+          ],
+        }],
+      ],
+    },
+    {
+      # Executable that contains all the tests to be run on the GPU bots.
+      'target_name': 'gpu_tests',
+      'type': 'executable',
+      'dependencies': [
+        # Runtime dependencies
+        '../third_party/mesa/mesa.gyp:osmesa',
+      ],
+      'includes': [
+        'test/gpu/test_support_gpu.gypi'
+      ],
+      'sources': [
+        'test/gpu/gpu_feature_browsertest.cc',
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS=="mac"', {
+      'targets': [
+        {
+          # This is the mac equivalent of the security_tests target below. It
+          # generates a framework bundle which bundles tests to be run in a
+          # renderer process. The test code is built as a framework so it can be
+          # run in the context of a renderer without shipping the code to end
+          # users.
+          'target_name': 'renderer_sandbox_tests',
+          'type': 'shared_library',
+          'product_name': 'Renderer Sandbox Tests',
+          'mac_bundle': 1,
+          'xcode_settings': {
+            'INFOPLIST_FILE': 'test/security_tests/sandbox_tests_mac-Info.plist',
+          },
+          'sources': [
+            'test/security_tests/renderer_sandbox_tests_mac.mm',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+            ],
+          },
+        },  # target renderer_sandbox_tests
+        {
+          # Tests for Mac app launcher.
+          'target_name': 'app_mode_app_tests',
+          'type': 'executable',
+          'product_name': 'app_mode_app_tests',
+          'dependencies': [
+            '../base/base.gyp:test_support_base',
+            '../chrome/common_constants.gyp:common_constants',
+            '../testing/gtest.gyp:gtest',
+            'chrome.gyp:chrome',  # run time dependency
+            'app_mode_app_support',
+          ],
+          'sources': [
+            'common/mac/app_mode_chrome_locator_unittest.mm',
+            'test/base/app_mode_app_tests.cc',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+            ],
+          },
+        },  # target app_mode_app_tests
+      ],
+    }],
+    ['OS!="mac"', {
+      'targets': [
+        {
+          'target_name': 'perf_tests',
+          'type': 'executable',
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)',  # Needed by key_systems.cc.
+          ],
+          'dependencies': [
+            'browser',
+            'chrome_resources.gyp:chrome_resources',
+            'chrome_resources.gyp:chrome_strings',
+            'common',
+            'renderer',
+            '../content/content.gyp:content_gpu',
+            '../content/content.gyp:test_support_content',
+            '../base/base.gyp:base',
+            '../base/base.gyp:test_support_base',
+            '../base/base.gyp:test_support_perf',
+            '../skia/skia.gyp:skia',
+            '../testing/gtest.gyp:gtest',
+            '../webkit/support/webkit_support.gyp:glue',
+            '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+          ],
+          'sources': [
+            'test/perf/perftests.cc',
+            'test/perf/url_parse_perftest.cc',
+            '../content/browser/net/sqlite_persistent_cookie_store_perftest.cc',
+
+            # TODO(boliu): Move this to a separate components_perftest target
+            # under components/.
+            '../components/visitedlink/test/visitedlink_perftest.cc',
+          ],
+          'conditions': [
+            ['use_x11==1', {
+              'dependencies': [
+                '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+              ],
+            }],
+            ['toolkit_uses_gtk == 1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
+            ['OS=="win"', {
+              'configurations': {
+                'Debug_Base': {
+                  'msvs_settings': {
+                    'VCLinkerTool': {
+                      'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                    },
+                  },
+                },
+              },
+              'conditions': [
+                ['win_use_allocator_shim==1', {
+                  'dependencies': [
+                    '<(allocator_target)',
+                  ],
+                }],
+              ],
+            }],
+            ['toolkit_views==1', {
+              'dependencies': [
+                '../ui/views/views.gyp:views',
+              ],
+            }],
+            ['os_posix == 1 and OS != "mac" and OS != "android"', {
+              'conditions': [
+                ['linux_use_tcmalloc==1', {
+                  'dependencies': [
+                    '../base/allocator/allocator.gyp:allocator',
+                  ],
+                }],
+              ],
+            }],
+            ['OS=="linux" and enable_webrtc==1', {
+              'dependencies': [
+                # TODO(tommi): Figure out why the 32bit lucid builder fails to
+                # find this dependency for this target (other builders pick it up
+                # correctly).  crbug.com/231068.
+                '../third_party/libjingle/libjingle.gyp:libpeerconnection',
+              ],
+            }],
+          ],
+        },
+      ],
+    },],  # OS!="mac"
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'security_tests',
+          'type': 'shared_library',
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'test/security_tests/ipc_security_tests.cc',
+            'test/security_tests/ipc_security_tests.h',
+            'test/security_tests/security_tests.cc',
+            '../sandbox/win/tests/validation_tests/commands.cc',
+            '../sandbox/win/tests/validation_tests/commands.h',
+          ],
+        },
+      ]},  # 'targets'
+    ],  # OS=="win"
+    # If you change this condition, make sure you also change it in all.gyp
+    # for the chromium_builder_qa target.
+    ['enable_automation==1 and (OS=="mac" or ((OS=="win" or os_posix==1) and target_arch==python_arch))', {
+      'targets': [
+        {
+          # Documentation: http://dev.chromium.org/developers/testing/pyauto
+          'target_name': 'pyautolib',
+          'type': 'loadable_module',
+          'product_prefix': '_',
+          'dependencies': [
+            'chrome',
+            'chrome_resources.gyp:chrome_resources',
+            'chrome_resources.gyp:chrome_strings',
+            'chrome_resources.gyp:theme_resources',
+            'debugger',
+            'test_support_common',
+            '../skia/skia.gyp:skia',
+            '../sync/sync.gyp:sync',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'export_dependent_settings': [
+            'test_support_common',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'cflags': [
+             '-Wno-uninitialized',
+             '-Wno-self-assign',  # to keep clang happy for generated code.
+          ],
+          'sources': [
+            'test/automation/proxy_launcher.cc',
+            'test/automation/proxy_launcher.h',
+            'test/pyautolib/pyautolib.cc',
+            'test/pyautolib/pyautolib.h',
+            'test/ui/ui_test.cc',
+            'test/ui/ui_test.h',
+            'test/ui/ui_test_suite.cc',
+            'test/ui/ui_test_suite.h',
+            '<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
+            '<@(pyautolib_sources)',
+          ],
+          'xcode_settings': {
+            # Link with python2.6. Using -L/usr/lib and -lpython2.6 does not
+            # work with the -isysroot argument passed in. Even if it did,
+            # the linker shouldn't use any other lib not in the 10.5 sdk.
+            'OTHER_LDFLAGS': [
+              '/usr/lib/libpython2.6.dylib'
+            ],
+          },
+          'msvs_disabled_warnings': [4211],
+          'conditions': [
+            # Disable the type profiler. _POSIX_C_SOURCE and _XOPEN_SOURCE
+            # conflict between <Python.h> and <typeinfo>.
+            ['OS=="linux" and clang_type_profiler==1', {
+              'cflags_cc!': [
+                '-fintercept-allocation-functions',
+              ],
+            }],
+            ['os_posix == 1 and OS!="mac"', {
+              'include_dirs': [
+                '..',
+                '<(sysroot)/usr/include/python<(python_ver)',
+              ],
+              'link_settings': {
+                'libraries': [
+                  '-lpython<(python_ver)',
+                ],
+              },
+            }],
+            ['toolkit_uses_gtk == 1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
+            ['OS=="mac"', {
+              'include_dirs': [
+                '..',
+                '/usr/include/python2.6',
+              ],
+            }],
+            ['OS=="win"', {
+              'product_extension': 'pyd',
+              'include_dirs': [
+                '..',
+                '../third_party/python_26/include',
+              ],
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'AdditionalLibraryDirectories': [
+                    '<(DEPTH)/third_party/python_26/libs',
+                  ],
+                  'AdditionalDependencies': [
+                    'python26.lib',
+                  ],
+                },
+              }
+            }],
+            ['clang == 1', {
+              'xcode_settings': {
+                'WARNING_CFLAGS': [
+                  # swig creates code with self assignments.
+                  '-Wno-self-assign',
+                ],
+              },
+              'cflags': [
+                '-Wno-self-assign',
+              ],
+            }],
+            ['asan==1', {
+              'cflags!': [ '-fsanitize=address' ],
+              'xcode_settings': { 'OTHER_CFLAGS!': [ '-fsanitize=address' ] },
+            }],
+          ],
+          'actions': [
+            {
+              'variables' : {
+                'swig_args': [ '-I..',
+                               '-python',
+                               '-c++',
+                               '-threads',
+                               '-outdir',
+                               '<(PRODUCT_DIR)',
+                               '-o',
+                               '<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
+                ],
+                'conditions': [
+                  ['chromeos==1', {
+                    'swig_args': [
+                      '-DOS_CHROMEOS',
+                    ]
+                  }],
+                ],
+              },
+              'action_name': 'pyautolib_swig',
+              'inputs': [
+                'test/pyautolib/argc_argv.i',
+                'test/pyautolib/pyautolib.i',
+                '<@(pyautolib_sources)',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
+                '<(PRODUCT_DIR)/pyautolib.py',
+              ],
+              'action': [ 'python',
+                          '../tools/swig/swig.py',
+                          '<@(swig_args)',
+                          'test/pyautolib/pyautolib.i',
+              ],
+              'message': 'Generating swig wrappers for pyautolib.',
+              'msvs_cygwin_shell': 1,
+            },
+          ],  # actions
+        },  # target 'pyautolib'
+        {
+          # Required for WebRTC PyAuto tests.
+          'target_name': 'webrtc_test_tools',
+          'type': 'none',
+          'dependencies': [
+            'pyautolib',
+            '../third_party/libjingle/libjingle.gyp:peerconnection_server',
+            '../third_party/webrtc/tools/tools.gyp:frame_analyzer',
+            '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
+          ],
+        },  # target 'webrtc_test_tools'
+      ]  # targets
+    }],
+    # To enable the coverage targets, do
+    #    GYP_DEFINES='coverage=1' gclient sync
+    # To match the coverage buildbot more closely, do this:
+    #    GYP_DEFINES='coverage=1 enable_svg=0 fastbuild=1' gclient sync
+    # (and, on MacOS, be sure to switch your SDK from "Base SDK" to "Mac OS X
+    # 10.6")
+    # (but on Windows, don't set the fastbuild=1 because it removes the PDB
+    # generation which is necessary for code coverage.)
+    ['coverage!=0',
+      { 'targets': [
+        {
+          ### Coverage BUILD AND RUN.
+          ### Not named coverage_build_and_run for historical reasons.
+          'target_name': 'coverage',
+          'dependencies': [ 'coverage_build', 'coverage_run' ],
+          # do NOT place this in the 'all' list; most won't want it.
+          # In gyp, booleans are 0/1 not True/False.
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'actions': [
+            {
+              'message': 'Coverage is now complete.',
+              # MSVS must have an input file and an output file.
+              'inputs': [ '<(PRODUCT_DIR)/coverage.info' ],
+              'outputs': [ '<(PRODUCT_DIR)/coverage-build-and-run.stamp' ],
+              'action_name': 'coverage',
+              # Wish gyp had some basic builtin commands (e.g. 'touch').
+              'action': [ 'python', '-c',
+                          'import os; ' \
+                          'open(' \
+                          '\'<(PRODUCT_DIR)\' + os.path.sep + ' \
+                          '\'coverage-build-and-run.stamp\'' \
+                          ', \'w\').close()' ],
+              # Use outputs of this action as inputs for the main target build.
+              # Seems as a misnomer but makes this happy on Linux (scons).
+              'process_outputs_as_sources': 1,
+            },
+          ],  # 'actions'
+        },
+        ### Coverage BUILD.  Compile only; does not run the bundles.
+        ### Intended as the build phase for our coverage bots.
+        ###
+        ### Builds unit test bundles needed for coverage.
+        ### Outputs this list of bundles into coverage_bundles.py.
+        ###
+        ### If you want to both build and run coverage from your IDE,
+        ### use the 'coverage' target.
+        {
+          'target_name': 'coverage_build',
+          # do NOT place this in the 'all' list; most won't want it.
+          # In gyp, booleans are 0/1 not True/False.
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'dependencies': [
+            'automated_ui_tests',
+            '../base/base.gyp:base_unittests',
+            # browser_tests's use of subprocesses chokes gcov on 10.6?
+            # Disabling for now (enabled on linux/windows below).
+            # 'browser_tests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../media/media.gyp:media_unittests',
+            '../net/net.gyp:net_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../sql/sql.gyp:sql_unittests',
+            '../content/content.gyp:content_unittests',
+            'unit_tests',
+            '../sync/sync.gyp:sync_unit_tests',
+          ],  # 'dependencies'
+          'conditions': [
+            ['OS=="win"', {
+              'dependencies': [
+                # Courgette has not been ported from Windows.
+                # Note build/win/chrome_win.croc uniquely has the
+                # courgette source directory in an include path.
+                '../courgette/courgette.gyp:courgette_unittests',
+                'browser_tests',
+                ]}],
+            ['OS=="linux"', {
+              'dependencies': [
+                # Win bot needs to be turned into an interactive bot.
+                'interactive_ui_tests',
+                # Disabled from running in coverage_posix.py.
+                # We need to build this during compile step, so enabling here.
+                '../content/content.gyp:content_browsertests',
+                '../courgette/courgette.gyp:courgette_unittests',
+                '../crypto/crypto.gyp:crypto_unittests',
+                '../jingle/jingle.gyp:jingle_unittests',
+                '../net/net.gyp:net_perftests',
+                '../third_party/WebKit/public/all.gyp:all_blink',
+                '../url/url.gyp:url_unittests',
+                'browser_tests',
+                'chromedriver_unittests',
+                'gpu_tests',
+                'performance_ui_tests',
+                'pyautolib',
+                'reliability_tests',
+                'sync_integration_tests',
+              ]}],
+            ['OS=="mac"', {
+              'dependencies': [
+              # Placeholder; empty for now.
+              ]}],
+          ],  # 'conditions'
+          'actions': [
+            {
+              # 'message' for Linux/scons in particular.  Scons
+              # requires the 'coverage' target be run from within
+              # src/chrome.
+              'message': 'Compiling coverage bundles.',
+              # MSVS must have an input file and an output file.
+              #
+              # TODO(jrg):
+              # Technically I want inputs to be the list of
+              # executables created in <@(_dependencies) but use of
+              # that variable lists the dep by dep name, not their
+              # output executable name.
+              # Is there a better way to force this action to run, always?
+              #
+              # If a test bundle is added to this coverage_build target it
+              # necessarily means this file (chrome_tests.gypi) is changed,
+              # so the action is run (coverage_bundles.py is generated).
+              # Exceptions to that rule are theoretically possible
+              # (e.g. re-gyp with a GYP_DEFINES set).
+              # Else it's the same list of bundles as last time.  They are
+              # built (since on the deps list) but the action may not run.
+              # For now, things work, but it's less than ideal.
+              'inputs': [ 'chrome_tests.gypi' ],
+              'outputs': [ '<(PRODUCT_DIR)/coverage_bundles.py' ],
+              'action_name': 'coverage_build',
+              'action': [ 'python', '-c',
+                          'import os; '
+                          'f = open(' \
+                          '\'<(PRODUCT_DIR)\' + os.path.sep + ' \
+                          '\'coverage_bundles.py\'' \
+                          ', \'w\'); ' \
+                          'deplist = \'' \
+                          '<@(_dependencies)' \
+                          '\'.split(\' \'); ' \
+                          'f.write(str(deplist)); ' \
+                          'f.close()'],
+              # Use outputs of this action as inputs for the main target build.
+              # Seems as a misnomer but makes this happy on Linux (scons).
+              'process_outputs_as_sources': 1,
+            },
+          ],  # 'actions'
+        },
+        ### Coverage RUN.  Does not compile the bundles.  Mirrors the
+        ### run_coverage_bundles buildbot phase.  If you update this
+        ### command update the mirror in
+        ### $BUILDBOT/scripts/master/factory/chromium_commands.py.
+        ### If you want both build and run, use the 'coverage' target.
+        {
+          'target_name': 'coverage_run',
+          # do NOT place this in the 'all' list; most won't want it.
+          # In gyp, booleans are 0/1 not True/False.
+          'suppress_wildcard': 1,
+          'type': 'none',
+          'actions': [
+            {
+              # 'message' for Linux/scons in particular.  Scons
+              # requires the 'coverage' target be run from within
+              # src/chrome.
+              'message': 'Running the coverage script.  NOT building anything.',
+              # MSVS must have an input file and an output file.
+              'inputs': [ '<(PRODUCT_DIR)/coverage_bundles.py' ],
+              'outputs': [ '<(PRODUCT_DIR)/coverage.info' ],
+              'action_name': 'coverage_run',
+              'action': [ 'python',
+                          '../tools/code_coverage/coverage_posix.py',
+                          '--directory',
+                          '<(PRODUCT_DIR)',
+                          '--src_root',
+                          '..',
+                          '--bundles',
+                          '<(PRODUCT_DIR)/coverage_bundles.py'],
+              # Use outputs of this action as inputs for the main target build.
+              # Seems as a misnomer but makes this happy on Linux (scons).
+              'process_outputs_as_sources': 1,
+            },
+          ],  # 'actions'
+        },
+      ]
+    }],  # 'coverage!=0'
+    ['OS == "android"', {
+      'targets': [
+        {
+          'target_name': 'chromium_testshell_test_apk',
+          'type': 'none',
+          'dependencies': [
+            'chrome_java',
+            'chromium_testshell_java',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_java_test_support',
+            '../content/content.gyp:content_java_test_support',
+            '../sync/sync.gyp:sync_javatests',
+          ],
+          'variables': {
+            'apk_name': 'ChromiumTestShellTest',
+            'java_in_dir': 'android/testshell/javatests',
+            'resource_dir': 'android/testshell/res',
+            'additional_src_dirs': ['android/javatests/src'],
+            'is_test_apk': 1,
+          },
+          'includes': [ '../build/java_apk.gypi' ],
+        },
+        {
+          'target_name': 'chromium_testshell_uiautomator_tests_java',
+          'type': 'none',
+          'variables': {
+            'java_in_dir': 'android/uiautomator_tests',
+          },
+          'dependencies': [
+            '../base/base.gyp:base_java_test_support',
+            '../third_party/android_tools/android_tools.gyp:uiautomator_jar',
+          ],
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
+          'target_name': 'chromium_testshell_uiautomator_tests',
+          'type': 'none',
+          'dependencies': [
+            'chromium_testshell_uiautomator_tests_java',
+          ],
+          'includes': [ '../build/uiautomator_test.gypi' ],
+        },
+      ],
+    }],
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'browser_tests_run',
+          'type': 'none',
+          'dependencies': [
+            'browser_tests',
+            'chrome',
+            '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+            'browser_tests.isolate',
+          ],
+          'sources': [
+            'browser_tests.isolate',
+          ],
+        },
+        {
+          'target_name': 'interactive_ui_tests_run',
+          'type': 'none',
+          'dependencies': [
+            'interactive_ui_tests',
+          ],
+          'conditions': [
+            ['use_x11 == 1', {
+              'dependencies': [
+                '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+              ],
+            }],
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+            'interactive_ui_tests.isolate',
+          ],
+          'sources': [
+            'interactive_ui_tests.isolate',
+          ],
+        },
+        {
+          'target_name': 'sync_integration_tests_run',
+          'type': 'none',
+          'dependencies': [
+            'sync_integration_tests',
+          ],
+          'conditions': [
+            ['use_x11 == 1', {
+              'dependencies': [
+                '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+              ],
+            }],
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+            'sync_integration_tests.isolate',
+          ],
+          'sources': [
+            'sync_integration_tests.isolate',
+          ],
+        },
+      ],
+    }],
+    ['OS=="win"', {
+      'targets' : [
+        {
+          # This target is only depended upon in Windows.
+          'target_name': 'automated_ui_tests_exe_pdb_workaround',
+          'type': 'static_library',
+          'sources': [ 'empty_pdb_workaround.cc' ],
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              # This *in the compile phase* must match the pdb name that's
+              # output by the final link. See empty_pdb_workaround.cc for
+              # more details.
+              'DebugInformationFormat': '3',
+              'ProgramDataBaseFileName': '<(PRODUCT_DIR)/automated_ui_tests.exe.pdb',
+            },
+          },
+        },
+        {
+          # This target is only depended upon in Windows.
+          'target_name': 'browser_tests_exe_pdb_workaround',
+          'type': 'static_library',
+          'sources': [ 'empty_pdb_workaround.cc' ],
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              # This *in the compile phase* must match the pdb name that's
+              # output by the final link. See empty_pdb_workaround.cc for
+              # more details.
+              'DebugInformationFormat': '3',
+              'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
+            },
+          },
+        },
+      ],
+    }],
+    [ 'enable_mdns == 1', {
+      'targets': [{
+          'target_name': 'service_discovery_sniffer',
+          'type': 'executable',
+          'dependencies': [
+            '../net/net.gyp:net',
+            '../base/base.gyp:base',
+            '../base/base.gyp:test_support_base',
+            'utility',
+          ],
+          'sources': [
+            'tools/service_discovery_sniffer/service_discovery_sniffer.h',
+            'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
+          ],
+        }]
+    }],
+  ],  # 'conditions'
+}
diff --git a/chromium/chrome/chrome_tests_unit.gypi b/chromium/chrome/chrome_tests_unit.gypi
new file mode 100644
index 00000000000..1cc82a06476
--- /dev/null
+++ b/chromium/chrome/chrome_tests_unit.gypi
@@ -0,0 +1,2755 @@
+# Copyright 2012 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.
+{
+  'targets': [
+    {
+      # This target contains mocks and test utilities that don't belong in
+      # production libraries but are used by more than one test executable.
+      'target_name': 'test_support_common',
+      'type': 'static_library',
+      'dependencies': [
+        # NOTE: New dependencies should generally be added in the OS!="ios"
+        # dependencies block below, rather than here.
+        'browser',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:theme_resources',
+        'common',
+        '../base/base.gyp:test_support_base',
+        '../base/base.gyp:base_prefs_test_support',
+        '../components/components.gyp:sessions_test_support',
+        '../content/content.gyp:content_app_both',
+        '../content/content.gyp:test_support_content',
+        '../media/media.gyp:media_test_support',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_test_support',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/message_center/message_center.gyp:message_center_test_support',
+      ],
+      'export_dependent_settings': [
+        '../base/base.gyp:test_support_base',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'app/breakpad_mac_stubs.mm',
+        'app/chrome_main_delegate.cc',
+        'app/chrome_main_delegate.h',
+        'browser/android/mock_google_location_settings_helper.cc',
+        'browser/android/mock_google_location_settings_helper.h',
+        'browser/android/tab_android_test_stubs.cc',
+        'browser/browsing_data/mock_browsing_data_appcache_helper.cc',
+        'browser/browsing_data/mock_browsing_data_appcache_helper.h',
+        'browser/browsing_data/mock_browsing_data_cookie_helper.cc',
+        'browser/browsing_data/mock_browsing_data_cookie_helper.h',
+        'browser/browsing_data/mock_browsing_data_database_helper.cc',
+        'browser/browsing_data/mock_browsing_data_database_helper.h',
+        'browser/browsing_data/mock_browsing_data_file_system_helper.cc',
+        'browser/browsing_data/mock_browsing_data_file_system_helper.h',
+        'browser/browsing_data/mock_browsing_data_flash_lso_helper.cc',
+        'browser/browsing_data/mock_browsing_data_flash_lso_helper.h',
+        'browser/browsing_data/mock_browsing_data_indexed_db_helper.cc',
+        'browser/browsing_data/mock_browsing_data_indexed_db_helper.h',
+        'browser/browsing_data/mock_browsing_data_local_storage_helper.cc',
+        'browser/browsing_data/mock_browsing_data_local_storage_helper.h',
+        'browser/browsing_data/mock_browsing_data_quota_helper.cc',
+        'browser/browsing_data/mock_browsing_data_quota_helper.h',
+        'browser/browsing_data/mock_browsing_data_server_bound_cert_helper.cc',
+        'browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h',
+        'browser/chromeos/contacts/contact_test_util.cc',
+        'browser/chromeos/contacts/contact_test_util.h',
+        'browser/chromeos/cros/mock_network_library.cc',
+        'browser/chromeos/cros/mock_network_library.h',
+        'browser/chromeos/input_method/mock_candidate_window_controller.cc',
+        'browser/chromeos/input_method/mock_candidate_window_controller.h',
+        'browser/chromeos/input_method/mock_input_method_manager.cc',
+        'browser/chromeos/input_method/mock_input_method_manager.h',
+        'browser/chromeos/login/fake_login_utils.cc',
+        'browser/chromeos/login/fake_login_utils.h',
+        'browser/chromeos/login/mock_authenticator.cc',
+        'browser/chromeos/login/mock_authenticator.h',
+        'browser/chromeos/login/mock_login_display.cc',
+        'browser/chromeos/login/mock_login_display.h',
+        'browser/chromeos/login/mock_login_display_host.cc',
+        'browser/chromeos/login/mock_login_display_host.h',
+        'browser/chromeos/login/mock_login_status_consumer.cc',
+        'browser/chromeos/login/mock_login_status_consumer.h',
+        'browser/chromeos/login/mock_login_utils.cc',
+        'browser/chromeos/login/mock_login_utils.h',
+        'browser/chromeos/login/mock_url_fetchers.cc',
+        'browser/chromeos/login/mock_url_fetchers.h',
+        'browser/chromeos/login/mock_user_image_manager.cc',
+        'browser/chromeos/login/mock_user_image_manager.h',
+        'browser/chromeos/login/mock_user_manager.cc',
+        'browser/chromeos/login/mock_user_manager.h',
+        'browser/chromeos/policy/device_policy_builder.cc',
+        'browser/chromeos/policy/device_policy_builder.h',
+        'browser/chromeos/policy/stub_enterprise_install_attributes.cc',
+        'browser/chromeos/policy/stub_enterprise_install_attributes.h',
+        'browser/chromeos/settings/device_settings_test_helper.cc',
+        'browser/chromeos/settings/device_settings_test_helper.h',
+        'browser/chromeos/settings/mock_owner_key_util.cc',
+        'browser/chromeos/settings/mock_owner_key_util.h',
+        'browser/chromeos/system/mock_statistics_provider.cc',
+        'browser/chromeos/system/mock_statistics_provider.h',
+        # The only thing used from browser is Browser::Type.
+        'browser/download/download_test_file_activity_observer.cc',
+        'browser/download/download_test_file_activity_observer.h',
+        'browser/download/test_download_shelf.cc',
+        'browser/download/test_download_shelf.h',
+        'browser/drive/dummy_drive_service.cc',
+        'browser/drive/dummy_drive_service.h',
+        'browser/drive/fake_drive_service.cc',
+        'browser/drive/fake_drive_service.h',
+        'browser/extensions/api/messaging/native_messaging_test_util.cc',
+        'browser/extensions/api/messaging/native_messaging_test_util.h',
+        'browser/extensions/extension_notification_observer.cc',
+        'browser/extensions/extension_notification_observer.h',
+        'browser/extensions/fake_safe_browsing_database_manager.cc',
+        'browser/extensions/fake_safe_browsing_database_manager.h',
+        'browser/extensions/mock_extension_special_storage_policy.cc',
+        'browser/extensions/mock_extension_special_storage_policy.h',
+        'browser/extensions/test_blacklist.cc',
+        'browser/extensions/test_blacklist.h',
+        'browser/extensions/test_extension_environment.cc',
+        'browser/extensions/test_extension_environment.h',
+        'browser/extensions/test_extension_prefs.cc',
+        'browser/extensions/test_extension_prefs.h',
+        'browser/extensions/test_extension_service.cc',
+        'browser/extensions/test_extension_service.h',
+        'browser/extensions/test_extension_system.cc',
+        'browser/extensions/test_extension_system.h',
+        'browser/extensions/test_management_policy.cc',
+        'browser/extensions/test_management_policy.h',
+        'browser/google_apis/dummy_auth_service.cc',
+        'browser/google_apis/dummy_auth_service.h',
+        'browser/google_apis/test_util.cc',
+        'browser/google_apis/test_util.h',
+        'browser/media_galleries/media_galleries_test_util.cc',
+        'browser/media_galleries/media_galleries_test_util.h',
+        'browser/net/dns_probe_test_util.cc',
+        'browser/net/dns_probe_test_util.h',
+        'browser/net/url_request_mock_util.cc',
+        'browser/net/url_request_mock_util.h',
+        'browser/notifications/notification_test_util.cc',
+        'browser/notifications/notification_test_util.h',
+        'browser/password_manager/mock_password_store.cc',
+        'browser/password_manager/mock_password_store.h',
+        'browser/password_manager/password_form_data.cc',
+        'browser/password_manager/password_form_data.h',
+        'browser/password_manager/test_password_store.cc',
+        'browser/password_manager/test_password_store.h',
+        'browser/policy/cloud/mock_cloud_policy_client.cc',
+        'browser/policy/cloud/mock_cloud_policy_client.h',
+        'browser/policy/cloud/mock_cloud_policy_store.cc',
+        'browser/policy/cloud/mock_cloud_policy_store.h',
+        'browser/policy/cloud/policy_builder.cc',
+        'browser/policy/cloud/policy_builder.h',
+        'browser/policy/mock_configuration_policy_provider.cc',
+        'browser/policy/mock_configuration_policy_provider.h',
+        'browser/policy/test/local_policy_test_server.cc',
+        'browser/policy/test/local_policy_test_server.h',
+        'browser/prefs/pref_service_mock_builder.cc',
+        'browser/prefs/pref_service_mock_builder.h',
+        'browser/profile_resetter/profile_resetter_test_base.cc',
+        'browser/profile_resetter/profile_resetter_test_base.h',
+        'browser/search_engines/template_url_service_test_util.cc',
+        'browser/search_engines/template_url_service_test_util.h',
+        'browser/sessions/session_service_test_helper.cc',
+        'browser/sessions/session_service_test_helper.h',
+        'browser/signin/fake_signin_manager.cc',
+        'browser/signin/fake_signin_manager.h',
+        'browser/ssl/ssl_client_auth_requestor_mock.cc',
+        'browser/ssl/ssl_client_auth_requestor_mock.h',
+        'browser/storage_monitor/test_media_transfer_protocol_manager_linux.cc',
+        'browser/storage_monitor/test_media_transfer_protocol_manager_linux.h',
+        'browser/storage_monitor/test_storage_monitor.cc',
+        'browser/storage_monitor/test_storage_monitor.h',
+        'browser/ui/browser.h',
+        'browser/ui/cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm',
+        'browser/ui/cocoa/run_loop_testing.h',
+        'browser/ui/cocoa/run_loop_testing.mm',
+        'browser/ui/find_bar/find_bar_host_unittest_util.h',
+        'browser/ui/fullscreen/fullscreen_controller_state_test.cc',
+        'browser/ui/fullscreen/fullscreen_controller_state_test.h',
+        'browser/ui/fullscreen/fullscreen_controller_state_tests.h',
+        'browser/ui/fullscreen/fullscreen_controller_test.cc',
+        'browser/ui/fullscreen/fullscreen_controller_test.h',
+        'browser/ui/gtk/find_bar_host_unittest_util_gtk.cc',
+        'browser/ui/test/test_confirm_bubble_model.cc',
+        'browser/ui/test/test_confirm_bubble_model.h',
+        'browser/ui/views/find_bar_host_unittest_util_views.cc',
+        'common/extensions/extension_builder.cc',
+        'common/extensions/extension_builder.h',
+        'common/extensions/extension_test_util.cc',
+        'common/extensions/extension_test_util.h',
+        'common/extensions/value_builder.cc',
+        'common/extensions/value_builder.h',
+        'renderer/chrome_mock_render_thread.cc',
+        'renderer/chrome_mock_render_thread.h',
+        'renderer/mock_printer.cc',
+        'renderer/mock_printer.h',
+        'renderer/safe_browsing/mock_feature_extractor_clock.cc',
+        'renderer/safe_browsing/mock_feature_extractor_clock.h',
+        'renderer/safe_browsing/test_utils.cc',
+        'renderer/safe_browsing/test_utils.h',
+        'test/automation/automation_handle_tracker.cc',
+        'test/automation/automation_handle_tracker.h',
+        'test/automation/automation_json_requests.cc',
+        'test/automation/automation_json_requests.h',
+        'test/automation/automation_proxy.cc',
+        'test/automation/automation_proxy.h',
+        'test/automation/browser_proxy.cc',
+        'test/automation/browser_proxy.h',
+        'test/automation/tab_proxy.cc',
+        'test/automation/tab_proxy.h',
+        'test/automation/value_conversion_traits.cc',
+        'test/automation/value_conversion_traits.h',
+        'test/automation/value_conversion_util.h',
+        'test/automation/window_proxy.cc',
+        'test/automation/window_proxy.h',
+        'test/base/bookmark_load_observer.cc',
+        'test/base/bookmark_load_observer.h',
+        'test/base/chrome_render_view_host_test_harness.cc',
+        'test/base/chrome_render_view_host_test_harness.h',
+        'test/base/chrome_test_suite.cc',
+        'test/base/chrome_test_suite.h',
+        'test/base/find_in_page_observer.cc',
+        'test/base/find_in_page_observer.h',
+        'test/base/history_index_restore_observer.cc',
+        'test/base/history_index_restore_observer.h',
+        'test/base/in_process_browser_test.cc',
+        'test/base/in_process_browser_test.h',
+        'test/base/javascript_test_observer.cc',
+        'test/base/javascript_test_observer.h',
+        'test/base/module_system_test.cc',
+        'test/base/module_system_test.h',
+        'test/base/profile_mock.cc',
+        'test/base/profile_mock.h',
+        'test/base/scoped_testing_local_state.cc',
+        'test/base/scoped_testing_local_state.h',
+        'test/base/test_browser_window.cc',
+        'test/base/test_browser_window.h',
+        'test/base/test_launcher_utils.cc',
+        'test/base/test_launcher_utils.h',
+        'test/base/test_location_bar.cc',
+        'test/base/test_location_bar.h',
+        'test/base/test_tab_strip_model_observer.cc',
+        'test/base/test_tab_strip_model_observer.h',
+        'test/base/testing_browser_process.cc',
+        'test/base/testing_browser_process.h',
+        'test/base/testing_browser_process_platform_part.h',
+        'test/base/testing_browser_process_platform_part.cc',
+        'test/base/testing_io_thread_state.cc',
+        'test/base/testing_io_thread_state.h',
+        'test/base/testing_pref_service_syncable.cc',
+        'test/base/testing_pref_service_syncable.h',
+        'test/base/testing_profile.cc',
+        'test/base/testing_profile.h',
+        'test/base/testing_profile_manager.cc',
+        'test/base/testing_profile_manager.h',
+        'test/base/tracing.cc',
+        'test/base/tracing.h',
+        'test/base/ui_test_utils.cc',
+        'test/base/ui_test_utils.h',
+        'test/base/uma_histogram_helper.cc',
+        'test/base/uma_histogram_helper.h',
+        'test/logging/win/file_logger.cc',
+        'test/logging/win/file_logger.h',
+        'test/logging/win/log_file_printer.cc',
+        'test/logging/win/log_file_printer.h',
+        'test/logging/win/log_file_reader.cc',
+        'test/logging/win/log_file_reader.h',
+        'test/logging/win/mof_data_parser.cc',
+        'test/logging/win/mof_data_parser.h',
+        'test/logging/win/test_log_collector.cc',
+        'test/logging/win/test_log_collector.h',
+        'test/ppapi/ppapi_test.cc',
+        'test/ppapi/ppapi_test.h',
+        '../ui/gfx/image/image_unittest_util.cc',
+        '../ui/gfx/image/image_unittest_util.h',
+        '../webkit/browser/fileapi/mock_file_system_context.cc',
+        '../webkit/browser/fileapi/mock_file_system_context.h',
+        '../webkit/browser/fileapi/mock_file_system_options.cc',
+        '../webkit/browser/fileapi/mock_file_system_options.h',
+        '../webkit/browser/fileapi/sandbox_file_system_test_helper.cc',
+        '../webkit/browser/fileapi/sandbox_file_system_test_helper.h',
+        '../webkit/browser/quota/mock_quota_manager.cc',
+        '../webkit/browser/quota/mock_quota_manager.h',
+        '../webkit/browser/quota/mock_special_storage_policy.cc',
+        '../webkit/browser/quota/mock_special_storage_policy.h',
+      ],
+      'conditions': [
+        ['OS!="ios"', {
+          'dependencies': [
+            'cloud_policy_proto',
+            'common/extensions/api/api.gyp:api',
+            'plugin',
+            'renderer',
+            'utility',
+            '../content/content.gyp:content_gpu',
+            '../content/content.gyp:content_plugin',
+            '../content/content.gyp:content_ppapi_plugin',
+            '../content/content.gyp:content_renderer',
+            '../content/content.gyp:content_utility',
+            '../content/content.gyp:content_worker',
+            '../components/components.gyp:autofill_core_test_support',
+            '../ipc/ipc.gyp:test_support_ipc',
+            '../ppapi/ppapi_internal.gyp:ppapi_shared',
+            '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+            '../webkit/support/webkit_support.gyp:glue_child',
+          ],
+          'export_dependent_settings': [
+            'renderer',
+          ],
+        }, {  # OS=="ios"
+          'sources/': [
+            # Exclude everything but iOS-specific files.
+            ['exclude', '\\.(cc|mm)$'],
+            ['include', '_ios\\.(cc|mm)$'],
+            ['include', '(^|/)ios/'],
+            # TODO(ios): Add files here as they are updated to compile on iOS.
+            ['include', '^test/base/chrome_test_suite\\.cc$'],
+            ['include', '^test/base/testing_browser_process'],
+          ],
+        }],
+        ['chromeos==0', {
+          'sources/': [
+            ['exclude', '^browser/chromeos'],
+          ],
+        }, {  # chromeos==1
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../chromeos/chromeos.gyp:chromeos_test_support',
+          ],
+        }],
+        ['configuration_policy==0', {
+          'sources/': [
+            ['exclude', '^browser/policy'],
+          ],
+        }],
+        ['configuration_policy==1', {
+          'dependencies': [
+            'app/policy/cloud_policy_codegen.gyp:policy_test_support',
+          ],
+          'export_dependent_settings': [
+            'app/policy/cloud_policy_codegen.gyp:policy_test_support',
+          ],
+        }],
+        ['safe_browsing!=1', {
+          'sources/': [
+            ['exclude', '^browser/extensions/blacklist_unittest.cc'],
+            ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.cc'],
+            ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.h'],
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+          'dependencies': [
+            '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['enable_printing==1', {
+          'dependencies': [
+            'service',
+          ],
+        }],
+        ['enable_printing==0', {
+          'sources/': [
+            ['exclude', '^renderer/mock_printer.cc'],
+            ['exclude', '^renderer/mock_printer.h'],
+          ],
+        }],
+        ['OS=="android"', {
+          'sources/': [
+            ['exclude', '^browser/media_galleries/'],
+          ],
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            '../ui/snapshot/snapshot.gyp:snapshot_test_support',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'conditions': [
+            ['use_aura==1', {
+              'dependencies': [
+                '../win8/win8.gyp:test_registrar_constants',
+                '../win8/win8.gyp:test_support_win8',
+              ],
+            }],
+          ],
+        }],
+        ['OS=="win" or OS=="mac"', {
+          'sources': [
+            'common/media_galleries/pmp_test_helper.cc',
+            'common/media_galleries/pmp_test_helper.h',
+          ],
+        }],
+        ['OS=="mac"', {
+          'dependencies': [
+            '../components/components.gyp:breakpad_stubs',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'test_support_unit',
+      'type': 'static_library',
+      'dependencies': [
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'browser',
+        'common',
+        'test_support_common',
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'browser/sync/profile_sync_service_mock.cc',
+        'browser/sync/profile_sync_service_mock.h',
+        'test/base/run_all_unittests.cc',
+      ],
+      'conditions': [
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            # Needed for the following #include chain:
+            #   test/base/run_all_unittests.cc
+            #   test/base/chrome_test_suite.h
+            #   gtk/gtk.h
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'unit_tests',
+      'type': '<(gtest_target_type)',
+      'dependencies': [
+        # NOTE: New dependencies should generally be added in the OS!="ios"
+        # dependencies block below, rather than here.
+        # Unit tests should only depend on:
+        # 1) everything that the chrome binaries depend on:
+        '<@(chromium_browser_dependencies)',
+        '<@(chromium_child_dependencies)',
+        # 2) test-specific support libraries:
+        '../base/base.gyp:test_support_base',
+        '../content/content.gyp:content_app_both',
+        '../media/media.gyp:media_test_support',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_test_support',
+        '../sync/sync.gyp:test_support_sync_api',
+        '../sync/sync.gyp:test_support_sync_core',
+        '../sync/sync.gyp:test_support_sync_internal_api',
+        '../sync/sync.gyp:test_support_sync_notifier',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        'test_support_common',
+        'test_support_unit',
+        # 3) anything tests directly depend on
+        '../courgette/courgette.gyp:courgette_lib',
+        '../google_apis/google_apis.gyp:google_apis',
+        '../skia/skia.gyp:skia',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/libxml/libxml.gyp:libxml',
+        '../ui/ui.gyp:ui_resources',
+        '../ui/ui.gyp:ui_test_support',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+      ],
+      # TODO(joi): Remove this section once the google_apis tests are
+      # a separate unit test binary.
+      'includes': [
+        '../google_apis/determine_use_official_keys.gypi',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'defines': [
+        'CLD_WINDOWS',
+      ],
+      'direct_dependent_settings': {
+        'defines': [
+          'CLD_WINDOWS',
+        ],
+      },
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'conditions': [
+            ['incremental_chrome_dll==1', {
+              'UseLibraryDependencyInputs': "true",
+            }],
+          ],
+        },
+      },
+      'sources': [
+        '../apps/app_shim/app_shim_host_mac_unittest.cc',
+        '../apps/saved_files_service_unittest.cc',
+        '../apps/app_shim/extension_app_shim_handler_mac_unittest.cc',
+        '../apps/shell_window_geometry_cache_unittest.cc',
+        '../extensions/browser/file_reader_unittest.cc',
+        '../extensions/common/event_filter_unittest.cc',
+        '../extensions/common/extension_resource_unittest.cc',
+        '../extensions/common/id_util_unittest.cc',
+        '../extensions/common/matcher/regex_set_matcher_unittest.cc',
+        '../extensions/common/matcher/string_pattern_unittest.cc',
+        '../extensions/common/matcher/substring_set_matcher_unittest.cc',
+        '../extensions/common/matcher/url_matcher_factory_unittest.cc',
+        '../extensions/common/matcher/url_matcher_unittest.cc',
+        '../extensions/common/one_shot_event_unittest.cc',
+        '../extensions/common/url_pattern_set_unittest.cc',
+        '../extensions/common/url_pattern_unittest.cc',
+        '../extensions/common/user_script_unittest.cc',
+        'app/chrome_dll.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
+        # All unittests in browser, common, renderer and service.
+        'browser/about_flags_unittest.cc',
+        'browser/app_controller_mac_unittest.mm',
+        'browser/autocomplete/autocomplete_input_unittest.cc',
+        'browser/autocomplete/autocomplete_match_unittest.cc',
+        'browser/autocomplete/autocomplete_provider_unittest.cc',
+        'browser/autocomplete/autocomplete_result_unittest.cc',
+        'browser/autocomplete/bookmark_provider_unittest.cc',
+        'browser/autocomplete/builtin_provider_unittest.cc',
+        'browser/autocomplete/contact_provider_chromeos_unittest.cc',
+        'browser/autocomplete/extension_app_provider_unittest.cc',
+        'browser/autocomplete/history_quick_provider_unittest.cc',
+        'browser/autocomplete/history_url_provider_unittest.cc',
+        'browser/autocomplete/keyword_provider_unittest.cc',
+        'browser/autocomplete/search_provider_unittest.cc',
+        'browser/autocomplete/shortcuts_provider_unittest.cc',
+        'browser/automation/chrome_frame_automation_provider_win_unittest.cc',
+        'browser/background/background_application_list_model_unittest.cc',
+        'browser/background/background_contents_service_unittest.cc',
+        'browser/background/background_mode_manager_unittest.cc',
+        'browser/bookmarks/bookmark_codec_unittest.cc',
+        'browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc',
+        'browser/bookmarks/bookmark_html_writer_unittest.cc',
+        'browser/bookmarks/bookmark_index_unittest.cc',
+        'browser/bookmarks/bookmark_model_test_utils.cc',
+        'browser/bookmarks/bookmark_model_test_utils.h',
+        'browser/bookmarks/bookmark_model_unittest.cc',
+        'browser/bookmarks/bookmark_node_data_unittest.cc',
+        'browser/bookmarks/bookmark_utils_unittest.cc',
+        'browser/browser_about_handler_unittest.cc',
+        'browser/browser_commands_unittest.cc',
+        'browser/browsing_data/browsing_data_appcache_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_cookie_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_database_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_file_system_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_local_storage_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_quota_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_remover_unittest.cc',
+        'browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc',
+        'browser/browsing_data/cookies_tree_model_unittest.cc',
+        'browser/captive_portal/captive_portal_detector_unittest.cc',
+        'browser/captive_portal/captive_portal_service_unittest.cc',
+        'browser/captive_portal/captive_portal_tab_helper_unittest.cc',
+        'browser/captive_portal/captive_portal_tab_reloader_unittest.cc',
+        'browser/captive_portal/testing_utils.cc',
+        'browser/captive_portal/testing_utils.h',
+        'browser/chrome_browser_application_mac_unittest.mm',
+        'browser/chrome_page_zoom_unittest.cc',
+        'browser/chrome_process_singleton_win_unittest.cc',
+        'browser/chromeos/accessibility/magnification_manager_unittest.cc',
+        'browser/chromeos/attestation/attestation_ca_client_unittest.cc',
+        'browser/chromeos/attestation/attestation_policy_observer_unittest.cc',
+        'browser/chromeos/contacts/contact_database_unittest.cc',
+        'browser/chromeos/contacts/contact_manager_stub.cc',
+        'browser/chromeos/contacts/contact_manager_stub.h',
+        'browser/chromeos/contacts/contact_manager_unittest.cc',
+        'browser/chromeos/contacts/contact_map_unittest.cc',
+        'browser/chromeos/contacts/fake_contact_database.cc',
+        'browser/chromeos/contacts/fake_contact_database.h',
+        'browser/chromeos/contacts/fake_contact_store.cc',
+        'browser/chromeos/contacts/fake_contact_store.h',
+        'browser/chromeos/contacts/gdata_contacts_service_stub.cc',
+        'browser/chromeos/contacts/gdata_contacts_service_stub.h',
+        'browser/chromeos/contacts/gdata_contacts_service_unittest.cc',
+        'browser/chromeos/contacts/google_contact_store_unittest.cc',
+        'browser/chromeos/cros/network_constants.h',
+        'browser/chromeos/cros/network_library.cc',
+        'browser/chromeos/cros/network_library.h',
+        'browser/chromeos/cros/network_library_impl_base.cc',
+        'browser/chromeos/cros/network_library_impl_base.h',
+        'browser/chromeos/cros/network_library_impl_stub.cc',
+        'browser/chromeos/cros/network_library_impl_stub.h',
+        'browser/chromeos/cros/network_library_unittest.cc',
+        'browser/chromeos/cros/network_property_ui_data_unittest.cc',
+        'browser/chromeos/customization_document_unittest.cc',
+        'browser/chromeos/dbus/cros_dbus_service_unittest.cc',
+        'browser/chromeos/dbus/printer_service_provider_unittest.cc',
+        'browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc',
+        'browser/chromeos/dbus/service_provider_test_helper.cc',
+        'browser/chromeos/dbus/service_provider_test_helper.h',
+        'browser/chromeos/display/display_preferences_unittest.cc',
+        'browser/chromeos/drive/change_list_loader_unittest.cc',
+        'browser/chromeos/drive/change_list_processor_unittest.cc',
+        'browser/chromeos/drive/download_handler_unittest.cc',
+        'browser/chromeos/drive/drive_app_registry_unittest.cc',
+        'browser/chromeos/drive/drive_file_stream_reader_unittest.cc',
+        'browser/chromeos/drive/drive_integration_service_unittest.cc',
+        'browser/chromeos/drive/drive_url_request_job_unittest.cc',
+        'browser/chromeos/drive/dummy_file_system.h',
+        'browser/chromeos/drive/fake_file_system.cc',
+        'browser/chromeos/drive/fake_file_system.h',
+        'browser/chromeos/drive/fake_file_system_unittest.cc',
+        'browser/chromeos/drive/fake_free_disk_space_getter.cc',
+        'browser/chromeos/drive/fake_free_disk_space_getter.h',
+        'browser/chromeos/drive/file_cache_metadata_unittest.cc',
+        'browser/chromeos/drive/file_cache_unittest.cc',
+        'browser/chromeos/drive/file_change_unittest.cc',
+        'browser/chromeos/drive/file_system/copy_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/create_directory_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/create_file_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/download_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/move_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/open_file_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/operation_test_base.cc',
+        'browser/chromeos/drive/file_system/operation_test_base.h',
+        'browser/chromeos/drive/file_system/remove_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/search_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/touch_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/truncate_operation_unittest.cc',
+        'browser/chromeos/drive/file_system/update_operation_unittest.cc',
+        'browser/chromeos/drive/file_system_unittest.cc',
+        'browser/chromeos/drive/file_system_util_unittest.cc',
+        'browser/chromeos/drive/file_write_helper_unittest.cc',
+        'browser/chromeos/drive/file_write_watcher_unittest.cc',
+        'browser/chromeos/drive/fileapi_worker_unittest.cc',
+        'browser/chromeos/drive/job_queue_unittest.cc',
+        'browser/chromeos/drive/job_scheduler_unittest.cc',
+        'browser/chromeos/drive/local_file_reader_unittest.cc',
+        'browser/chromeos/drive/remove_stale_cache_files_unittest.cc',
+        'browser/chromeos/drive/resource_entry_conversion_unittest.cc',
+        'browser/chromeos/drive/resource_metadata_storage_unittest.cc',
+        'browser/chromeos/drive/resource_metadata_unittest.cc',
+        'browser/chromeos/drive/search_metadata_unittest.cc',
+        'browser/chromeos/drive/sync_client_unittest.cc',
+        'browser/chromeos/drive/test_util.cc',
+        'browser/chromeos/drive/test_util.h',
+        'browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc',
+        'browser/chromeos/extensions/default_app_order_unittest.cc',
+        'browser/chromeos/extensions/file_manager/desktop_notifications_unittest.cc',
+        'browser/chromeos/extensions/file_manager/file_tasks_unittest.cc',
+        'browser/chromeos/extensions/file_manager/file_watcher_unittest.cc',
+        'browser/chromeos/extensions/file_manager/url_util_unittest.cc',
+        'browser/chromeos/extensions/wallpaper_private_api_unittest.cc',
+        'browser/chromeos/external_metrics_unittest.cc',
+        'browser/chromeos/fileapi/file_access_permissions_unittest.cc',
+        'browser/chromeos/fileapi/file_system_backend_unittest.cc',
+        'browser/chromeos/imageburner/burn_device_handler_unittest.cc',
+        'browser/chromeos/imageburner/burn_manager_unittest.cc',
+        'browser/chromeos/input_method/browser_state_monitor_unittest.cc',
+        'browser/chromeos/input_method/candidate_window_controller_impl_unittest.cc',
+        'browser/chromeos/input_method/candidate_window_view_unittest.cc',
+        'browser/chromeos/input_method/ibus_controller_base_unittest.cc',
+        'browser/chromeos/input_method/ibus_controller_impl_unittest.cc',
+        'browser/chromeos/input_method/ibus_controller_unittest.cc',
+        'browser/chromeos/input_method/input_method_configuration_unittest.cc',
+        'browser/chromeos/input_method/input_method_manager_impl_unittest.cc',
+        'browser/chromeos/input_method/input_method_persistence_unittest.cc',
+        'browser/chromeos/input_method/input_method_util_unittest.cc',
+        'browser/chromeos/keyboard_driven_event_rewriter_unittest.cc',
+        'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc',
+        'browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc',
+        'browser/chromeos/language_preferences_unittest.cc',
+        'browser/chromeos/login/default_pinned_apps_field_trial_unittest.cc',
+        'browser/chromeos/login/existing_user_controller_auto_login_unittest.cc',
+        'browser/chromeos/login/hwid_checker_unittest.cc',
+        'browser/chromeos/login/merge_session_load_page_unittest.cc',
+        'browser/chromeos/login/mock_auth_attempt_state_resolver.cc',
+        'browser/chromeos/login/mock_auth_attempt_state_resolver.h',
+        'browser/chromeos/login/online_attempt_unittest.cc',
+        'browser/chromeos/login/parallel_authenticator_unittest.cc',
+        'browser/chromeos/login/screens/screen_context_unittest.cc',
+        'browser/chromeos/login/user_manager_unittest.cc',
+        'browser/chromeos/login/wallpaper_manager_unittest.cc',
+        'browser/chromeos/memory/oom_priority_manager_unittest.cc',
+        'browser/chromeos/mobile/mobile_activator_unittest.cc',
+        'browser/chromeos/mobile_config_unittest.cc',
+        'browser/chromeos/net/network_portal_detector_impl_unittest.cc',
+        'browser/chromeos/net/onc_utils_unittest.cc',
+        'browser/chromeos/offline/offline_load_page_unittest.cc',
+        'browser/chromeos/policy/auto_enrollment_client_unittest.cc',
+        'browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc',
+        'browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc',
+        'browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc',
+        'browser/chromeos/policy/device_local_account_policy_service_unittest.cc',
+        'browser/chromeos/policy/enterprise_install_attributes_unittest.cc',
+        'browser/chromeos/policy/login_screen_power_management_policy_unittest.cc',
+        'browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc',
+        'browser/chromeos/policy/proxy_policy_provider_unittest.cc',
+        'browser/chromeos/policy/recommendation_restorer_unittest.cc',
+        'browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc',
+        'browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc',
+        'browser/chromeos/power/power_prefs_unittest.cc',
+        'browser/chromeos/preferences_unittest.cc',
+        'browser/chromeos/session_length_limiter_unittest.cc',
+        'browser/chromeos/proxy_config_service_impl_unittest.cc',
+        'browser/chromeos/settings/cros_settings_unittest.cc',
+        'browser/chromeos/settings/device_oauth2_token_service_unittest.cc',
+        'browser/chromeos/settings/device_settings_provider_unittest.cc',
+        'browser/chromeos/settings/device_settings_service_unittest.cc',
+        'browser/chromeos/settings/owner_key_util_unittest.cc',
+        'browser/chromeos/settings/session_manager_operation_unittest.cc',
+        'browser/chromeos/settings/stub_cros_settings_provider_unittest.cc',
+        'browser/chromeos/system/automatic_reboot_manager_unittest.cc',
+        'browser/chromeos/system_logs/lsb_release_log_source_unittest.cc',
+        'browser/chromeos/version_loader_unittest.cc',
+        'browser/command_updater_unittest.cc',
+        'browser/component_updater/test/component_installers_unittest.cc',
+        'browser/component_updater/test/component_patcher_mock.h',
+        'browser/component_updater/test/component_patcher_unittest.cc',
+        'browser/component_updater/test/component_updater_service_unittest.cc',
+        'browser/component_updater/test/test_installer.cc',
+        'browser/component_updater/test/url_request_post_interceptor.cc',
+        'browser/content_settings/content_settings_default_provider_unittest.cc',
+        'browser/content_settings/content_settings_mock_observer.cc',
+        'browser/content_settings/content_settings_mock_observer.h',
+        'browser/content_settings/content_settings_mock_provider.cc',
+        'browser/content_settings/content_settings_mock_provider.h',
+        'browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc',
+        'browser/content_settings/content_settings_policy_provider_unittest.cc',
+        'browser/content_settings/content_settings_pref_provider_unittest.cc',
+        'browser/content_settings/content_settings_provider_unittest.cc',
+        'browser/content_settings/content_settings_rule_unittest.cc',
+        'browser/content_settings/content_settings_usages_state_unittest.cc',
+        'browser/content_settings/content_settings_utils_unittest.cc',
+        'browser/content_settings/cookie_settings_unittest.cc',
+        'browser/content_settings/host_content_settings_map_unittest.cc',
+        'browser/content_settings/mock_settings_observer.cc',
+        'browser/content_settings/mock_settings_observer.h',
+        'browser/content_settings/permission_queue_controller_unittest.cc',
+        'browser/content_settings/tab_specific_content_settings_unittest.cc',
+        'browser/custom_handlers/protocol_handler_registry_unittest.cc',
+        'browser/diagnostics/diagnostics_model_unittest.cc',
+        'browser/diagnostics/diagnostics_controller_unittest.cc',
+        'browser/download/chrome_download_manager_delegate_unittest.cc',
+        'browser/download/download_item_model_unittest.cc',
+        'browser/download/all_download_item_notifier_unittest.cc',
+        'browser/download/download_history_unittest.cc',
+        'browser/download/download_query_unittest.cc',
+        'browser/download/download_request_infobar_delegate_unittest.cc',
+        'browser/download/download_request_limiter_unittest.cc',
+        'browser/download/download_path_reservation_tracker_unittest.cc',
+        'browser/download/download_shelf_unittest.cc',
+        'browser/download/download_status_updater_unittest.cc',
+        'browser/download/download_target_determiner_unittest.cc',
+        'browser/download/download_ui_controller_unittest.cc',
+        'browser/download/download_util_unittest.cc',
+        'browser/drive/drive_api_util_unittest.cc',
+        'browser/drive/drive_uploader_unittest.cc',
+        'browser/drive/event_logger_unittest.cc',
+        'browser/drive/fake_drive_service_unittest.cc',
+        'browser/enumerate_modules_model_unittest_win.cc',
+        'browser/extensions/active_tab_unittest.cc',
+        'browser/extensions/activity_log/activity_database_unittest.cc',
+        'browser/extensions/activity_log/activity_log_enabled_unittest.cc',
+        'browser/extensions/activity_log/activity_log_unittest.cc',
+        'browser/extensions/activity_log/activity_log_policy_unittest.cc',
+        'browser/extensions/activity_log/counting_policy_unittest.cc',
+        'browser/extensions/activity_log/database_string_table_unittest.cc',
+        'browser/extensions/activity_log/fullstream_ui_policy_unittest.cc',
+        'browser/extensions/admin_policy_unittest.cc',
+        'browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc',
+        'browser/extensions/api/alarms/alarms_api_unittest.cc',
+        'browser/extensions/api/api_resource_manager_unittest.cc',
+        'browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc',
+        'browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc',
+        'browser/extensions/api/content_settings/content_settings_store_unittest.cc',
+        'browser/extensions/api/content_settings/content_settings_unittest.cc',
+        'browser/extensions/api/cookies/cookies_unittest.cc',
+        'browser/extensions/api/declarative/declarative_rule_unittest.cc',
+        'browser/extensions/api/declarative/deduping_factory_unittest.cc',
+        'browser/extensions/api/declarative/initializing_rules_registry_unittest.cc',
+        'browser/extensions/api/declarative/rules_registry_service_unittest.cc',
+        'browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc',
+        'browser/extensions/api/declarative_content/content_action_unittest.cc',
+        'browser/extensions/api/declarative_content/content_condition_unittest.cc',
+        'browser/extensions/api/declarative_content/content_rules_registry_unittest.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc',
+        'browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc',
+        'browser/extensions/api/dial/dial_device_data_unittest.cc',
+        'browser/extensions/api/dial/dial_registry_unittest.cc',
+        'browser/extensions/api/dial/dial_service_unittest.cc',
+        'browser/extensions/api/discovery/discovery_api_unittest.cc',
+        'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc',
+        'browser/extensions/api/extension_action/extension_action_prefs_unittest.cc',
+        'browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc',
+        'browser/extensions/api/file_system/file_system_api_unittest.cc',
+        'browser/extensions/api/identity/experimental_web_auth_flow_unittest.cc',
+        'browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc',
+        'browser/extensions/api/identity/identity_mint_queue_unittest.cc',
+        'browser/extensions/api/idle/idle_api_unittest.cc',
+        'browser/extensions/api/log_private/syslog_parser_unittest.cc',
+        'browser/extensions/api/messaging/native_message_process_host_unittest.cc',
+        'browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc',
+        'browser/extensions/api/omnibox/omnibox_unittest.cc',
+        'browser/extensions/api/permissions/permissions_api_helpers_unittest.cc',
+        'browser/extensions/api/power/power_api_unittest.cc',
+        'browser/extensions/api/preference/preference_api_prefs_unittest.cc',
+        'browser/extensions/api/proxy/proxy_api_helpers_unittest.cc',
+        'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher_unittest.cc',
+        'browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc',
+        'browser/extensions/api/serial/serial_port_enumerator_unittest.cc',
+        'browser/extensions/api/signedin_devices/id_mapping_helper_unittest.cc',
+        'browser/extensions/api/signedin_devices/signedin_devices_api_unittest.cc',
+        'browser/extensions/api/socket/socket_api_unittest.cc',
+        'browser/extensions/api/socket/tcp_socket_unittest.cc',
+        'browser/extensions/api/socket/udp_socket_unittest.cc',
+        'browser/extensions/api/storage/policy_value_store_unittest.cc',
+        'browser/extensions/api/storage/settings_frontend_unittest.cc',
+        'browser/extensions/api/storage/settings_quota_unittest.cc',
+        'browser/extensions/api/storage/settings_sync_unittest.cc',
+        'browser/extensions/api/storage/settings_test_util.cc',
+        'browser/extensions/api/storage/settings_test_util.h',
+        'browser/extensions/api/streams_private/streams_private_manifest_unittest.cc',
+        'browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc',
+        'browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc',
+        'browser/extensions/api/web_request/form_data_parser_unittest.cc',
+        'browser/extensions/api/web_request/upload_data_presenter_unittest.cc',
+        'browser/extensions/api/web_request/web_request_api_unittest.cc',
+        'browser/extensions/api/web_request/web_request_permissions_unittest.cc',
+        'browser/extensions/api/web_request/web_request_time_tracker_unittest.cc',
+        'browser/extensions/app_sync_data_unittest.cc',
+        'browser/extensions/blacklist_unittest.cc',
+        'browser/extensions/browser_permissions_policy_delegate_unittest.cc',
+        'browser/extensions/component_loader_unittest.cc',
+        'browser/extensions/convert_user_script_unittest.cc',
+        'browser/extensions/convert_web_app_unittest.cc',
+        'browser/extensions/default_apps_unittest.cc',
+        'browser/extensions/error_console/error_console_unittest.cc',
+        'browser/extensions/event_listener_map_unittest.cc',
+        'browser/extensions/event_router_forwarder_unittest.cc',
+        'browser/extensions/extension_action_icon_factory_unittest.cc',
+        'browser/extensions/extension_action_unittest.cc',
+        'browser/extensions/extension_context_menu_model_unittest.cc',
+        'browser/extensions/extension_creator_filter_unittest.cc',
+        'browser/extensions/extension_function_test_utils.cc',
+        'browser/extensions/extension_function_test_utils.h',
+        'browser/extensions/extension_icon_image_unittest.cc',
+        'browser/extensions/extension_icon_manager_unittest.cc',
+        'browser/extensions/extension_info_map_unittest.cc',
+        'browser/extensions/extension_pref_value_map_unittest.cc',
+        'browser/extensions/extension_prefs_unittest.cc',
+        'browser/extensions/extension_prefs_unittest.h',
+        'browser/extensions/extension_process_manager_unittest.cc',
+        'browser/extensions/extension_protocols_unittest.cc',
+        'browser/extensions/extension_service_unittest.cc',
+        'browser/extensions/extension_service_unittest.h',
+        'browser/extensions/extension_sorting_unittest.cc',
+        'browser/extensions/extension_special_storage_policy_unittest.cc',
+        'browser/extensions/extension_sync_data_unittest.cc',
+        'browser/extensions/extension_ui_unittest.cc',
+        'browser/extensions/extension_warning_badge_service_unittest.cc',
+        'browser/extensions/extension_warning_service_unittest.cc',
+        'browser/extensions/extensions_quota_service_unittest.cc',
+        'browser/extensions/external_policy_loader_unittest.cc',
+        'browser/extensions/external_provider_impl_chromeos_unittest.cc',
+        'browser/extensions/image_loader_unittest.cc',
+        'browser/extensions/management_policy_unittest.cc',
+        'browser/extensions/menu_manager_unittest.cc',
+        'browser/extensions/pack_extension_unittest.cc',
+        'browser/extensions/page_action_controller_unittest.cc',
+        'browser/extensions/permissions_updater_unittest.cc',
+        'browser/extensions/process_map_unittest.cc',
+        'browser/extensions/sandboxed_unpacker_unittest.cc',
+        'browser/extensions/script_badge_controller_unittest.cc',
+        'browser/extensions/script_bubble_controller_unittest.cc',
+        'browser/extensions/token_cache/token_cache_service_unittest.cc',
+        'browser/extensions/standard_management_policy_provider_unittest.cc',
+        'browser/extensions/updater/extension_updater_unittest.cc',
+        'browser/extensions/user_script_listener_unittest.cc',
+        'browser/extensions/user_script_master_unittest.cc',
+        'browser/extensions/webstore_inline_installer_unittest.cc',
+        'browser/extensions/webstore_installer_unittest.cc',
+        'browser/external_protocol/external_protocol_handler_unittest.cc',
+        'browser/favicon/favicon_handler_unittest.cc',
+        'browser/file_select_helper_unittest.cc',
+        'browser/first_run/first_run_unittest.cc',
+        'browser/geolocation/chrome_geolocation_permission_context_unittest.cc',
+        'browser/global_keyboard_shortcuts_mac_unittest.mm',
+        'browser/google/google_search_counter_unittest.cc',
+        'browser/google/google_update_settings_unittest.cc',
+        'browser/google/google_url_tracker_unittest.cc',
+        'browser/google/google_util_unittest.cc',
+        'browser/google_apis/base_requests_unittest.cc',
+        'browser/google_apis/base_requests_server_unittest.cc',
+        'browser/google_apis/drive_api_requests_unittest.cc',
+        'browser/google_apis/drive_api_parser_unittest.cc',
+        'browser/google_apis/drive_api_url_generator_unittest.cc',
+        'browser/google_apis/gdata_wapi_parser_unittest.cc',
+        'browser/google_apis/gdata_wapi_requests_unittest.cc',
+        'browser/google_apis/gdata_wapi_url_generator_unittest.cc',
+        'browser/google_apis/request_util_unittest.cc',
+        'browser/google_apis/time_util_unittest.cc',
+        'browser/history/android/android_cache_database_unittest.cc',
+        'browser/history/android/android_history_provider_service_unittest.cc',
+        'browser/history/android/android_history_types_unittest.cc',
+        'browser/history/android/android_provider_backend_unittest.cc',
+        'browser/history/android/android_urls_database_unittest.cc',
+        'browser/history/android/bookmark_model_sql_handler_unittest.cc',
+        'browser/history/android/sqlite_cursor_unittest.cc',
+        'browser/history/android/urls_sql_handler_unittest.cc',
+        'browser/history/android/visit_sql_handler_unittest.cc',
+        'browser/history/expire_history_backend_unittest.cc',
+        'browser/history/history_backend_unittest.cc',
+        'browser/history/history_database_unittest.cc',
+        'browser/history/history_querying_unittest.cc',
+        'browser/history/history_types_unittest.cc',
+        'browser/history/history_unittest.cc',
+        'browser/history/history_unittest_base.cc',
+        'browser/history/history_unittest_base.h',
+        'browser/history/in_memory_url_index_types_unittest.cc',
+        'browser/history/in_memory_url_index_unittest.cc',
+        'browser/history/most_visited_tiles_experiment_unittest.cc',
+        'browser/history/query_parser_unittest.cc',
+        'browser/history/scored_history_match_unittest.cc',
+        'browser/history/select_favicon_frames_unittest.cc',
+        'browser/history/shortcuts_backend_unittest.cc',
+        'browser/history/shortcuts_database_unittest.cc',
+        'browser/history/snippet_unittest.cc',
+        'browser/history/thumbnail_database_unittest.cc',
+        'browser/history/top_sites_database_unittest.cc',
+        'browser/history/top_sites_impl_unittest.cc',
+        'browser/history/top_sites_likely_impl_unittest.cc',
+        'browser/history/typed_url_syncable_service_unittest.cc',
+        'browser/history/url_database_unittest.cc',
+        'browser/history/visit_database_unittest.cc',
+        'browser/history/visit_filter_unittest.cc',
+        'browser/history/visit_tracker_unittest.cc',
+        'browser/importer/firefox_profile_lock_unittest.cc',
+        'browser/importer/profile_writer_unittest.cc',
+        'browser/internal_auth_unittest.cc',
+        'browser/invalidation/invalidation_service_android_unittest.cc',
+        'browser/invalidation/invalidation_service_test_template.cc',
+        'browser/invalidation/invalidation_service_test_template.h',
+        'browser/invalidation/invalidator_storage_unittest.cc',
+        'browser/invalidation/ticl_invalidation_service_unittest.cc',
+        'browser/language_usage_metrics_unittest.cc',
+        'browser/local_discovery/privet_confirm_api_flow_unittest.cc',
+        'browser/local_discovery/privet_http_unittest.cc',
+        'browser/local_discovery/privet_url_fetcher_unittest.cc',
+        'browser/mac/keystone_glue_unittest.mm',
+        'browser/managed_mode/managed_mode_url_filter_unittest.cc',
+        'browser/managed_mode/managed_user_service_unittest.cc',
+        'browser/managed_mode/managed_user_sync_service_unittest.cc',
+        'browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc',
+        'browser/managed_mode/managed_user_registration_utility_unittest.cc',
+        'browser/media/desktop_media_picker_model_unittest.cc',
+        'browser/media/webrtc_log_uploader_unittest.cc',
+        'browser/media_galleries/fileapi/native_media_file_util_unittest.cc',
+        'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc',
+        'browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm',
+        'browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc',
+        'browser/media_galleries/media_file_system_registry_unittest.cc',
+        'browser/media_galleries/media_galleries_dialog_controller_mock.cc',
+        'browser/media_galleries/media_galleries_dialog_controller_mock.h',
+        'browser/media_galleries/media_galleries_permissions_unittest.cc',
+        'browser/media_galleries/media_galleries_dialog_controller_unittest.cc',
+        'browser/media_galleries/media_galleries_preferences_unittest.cc',
+        'browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc',
+        'browser/metrics/compression_utils_unittest.cc',
+        'browser/metrics/metrics_log_unittest.cc',
+        'browser/metrics/metrics_log_serializer_unittest.cc',
+        'browser/metrics/metrics_service_unittest.cc',
+        'browser/metrics/thread_watcher_unittest.cc',
+        'browser/metrics/time_ticks_experiment_unittest.cc',
+        'browser/metrics/variations/variations_http_header_provider_unittest.cc',
+        'browser/metrics/variations/variations_seed_processor_unittest.cc',
+        'browser/metrics/variations/variations_service_unittest.cc',
+        'browser/metrics/variations/variations_request_scheduler_unittest.cc',
+        'browser/nacl_host/nacl_file_host_unittest.cc',
+        'browser/nacl_host/nacl_validation_cache_unittest.cc',
+        'browser/nacl_host/pnacl_translation_cache_unittest.cc',
+        'browser/nacl_host/pnacl_host_unittest.cc',
+        'browser/net/chrome_fraudulent_certificate_reporter_unittest.cc',
+        'browser/net/chrome_network_delegate_unittest.cc',
+        'browser/net/connection_tester_unittest.cc',
+        'browser/net/dns_probe_runner_unittest.cc',
+        'browser/net/dns_probe_service_unittest.cc',
+        'browser/net/evicted_domain_cookie_counter_unittest.cc',
+        'browser/net/firefox_proxy_settings_unittest.cc',
+        'browser/net/gaia/gaia_oauth_fetcher_unittest.cc',
+        'browser/net/http_pipelining_compatibility_client_unittest.cc',
+        'browser/net/http_server_properties_manager_unittest.cc',
+        'browser/net/net_error_tab_helper_unittest.cc',
+        'browser/net/net_log_temp_file_unittest.cc',
+        'browser/net/network_stats_unittest.cc',
+        'browser/net/network_time_tracker_unittest.cc',
+        'browser/net/predictor_unittest.cc',
+        'browser/net/pref_proxy_config_tracker_impl_unittest.cc',
+        'browser/net/probe_message_unittest.cc',
+        'browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc',
+        'browser/net/sqlite_server_bound_cert_store_unittest.cc',
+        'browser/net/ssl_config_service_manager_pref_unittest.cc',
+        'browser/net/transport_security_persister_unittest.cc',
+        'browser/net/url_info_unittest.cc',
+        'browser/notifications/desktop_notification_service_unittest.cc',
+        'browser/notifications/message_center_notifications_unittest_win.cc',
+        'browser/notifications/message_center_settings_controller_unittest.cc',
+        'browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc',
+        'browser/notifications/sync_notifier/synced_notification_unittest.cc',
+        'browser/notifications/sync_notifier/sync_notifier_test_utils.cc',
+        'browser/notifications/sync_notifier/sync_notifier_test_utils.h',
+        'browser/omnibox/omnibox_field_trial_unittest.cc',
+        'browser/page_cycler/page_cycler_unittest.cc',
+        'browser/parsers/metadata_parser_filebase_unittest.cc',
+        'browser/password_manager/login_database_unittest.cc',
+        'browser/password_manager/native_backend_gnome_x_unittest.cc',
+        'browser/password_manager/native_backend_kwallet_x_unittest.cc',
+        'browser/password_manager/password_form_manager_unittest.cc',
+        'browser/password_manager/password_generation_manager_unittest.cc',
+        'browser/password_manager/password_manager_unittest.cc',
+        'browser/password_manager/password_store_unittest.cc',
+        'browser/password_manager/password_store_default_unittest.cc',
+        'browser/password_manager/password_store_mac_unittest.cc',
+        'browser/password_manager/password_store_win_unittest.cc',
+        'browser/password_manager/password_store_x_unittest.cc',
+        'browser/performance_monitor/database_unittest.cc',
+        'browser/plugins/plugin_finder_unittest.cc',
+        'browser/plugins/plugin_metadata_unittest.cc',
+        'browser/plugins/plugin_prefs_unittest.cc',
+        'browser/policy/async_policy_provider_unittest.cc',
+        'browser/policy/browser_policy_connector_unittest.cc',
+        'browser/policy/cloud/cloud_external_data_manager_base_unittest.cc',
+        'browser/policy/cloud/cloud_external_data_store_unittest.cc',
+        'browser/policy/cloud/cloud_policy_client_unittest.cc',
+        'browser/policy/cloud/cloud_policy_core_unittest.cc',
+        'browser/policy/cloud/cloud_policy_invalidator_unittest.cc',
+        'browser/policy/cloud/cloud_policy_manager_unittest.cc',
+        'browser/policy/cloud/cloud_policy_refresh_scheduler_unittest.cc',
+        'browser/policy/cloud/cloud_policy_service_unittest.cc',
+        'browser/policy/cloud/cloud_policy_validator_unittest.cc',
+        'browser/policy/cloud/component_cloud_policy_service_unittest.cc',
+        'browser/policy/cloud/component_cloud_policy_store_unittest.cc',
+        'browser/policy/cloud/component_cloud_policy_updater_unittest.cc',
+        'browser/policy/cloud/device_management_service_unittest.cc',
+        'browser/policy/cloud/external_policy_data_updater_unittest.cc',
+        'browser/policy/cloud/mock_device_management_service.cc',
+        'browser/policy/cloud/mock_device_management_service.h',
+        'browser/policy/cloud/mock_user_cloud_policy_store.cc',
+        'browser/policy/cloud/mock_user_cloud_policy_store.h',
+        'browser/policy/cloud/rate_limiter_unittest.cc',
+        'browser/policy/cloud/resource_cache_unittest.cc',
+        'browser/policy/cloud/user_cloud_policy_manager_unittest.cc',
+        'browser/policy/cloud/user_cloud_policy_store_unittest.cc',
+        'browser/policy/cloud/user_info_fetcher_unittest.cc',
+        'browser/policy/cloud/user_policy_signin_service_unittest.cc',
+        'browser/policy/config_dir_policy_loader_unittest.cc',
+        'browser/policy/configuration_policy_handler_unittest.cc',
+        'browser/policy/configuration_policy_pref_store_unittest.cc',
+        'browser/policy/configuration_policy_provider_test.cc',
+        'browser/policy/configuration_policy_provider_test.h',
+        'browser/policy/managed_mode_policy_provider_unittest.cc',
+        'browser/policy/mock_policy_service.cc',
+        'browser/policy/mock_policy_service.h',
+        'browser/policy/policy_bundle_unittest.cc',
+        'browser/policy/policy_domain_descriptor_unittest.cc',
+        'browser/policy/policy_loader_mac_unittest.cc',
+        'browser/policy/policy_loader_win_unittest.cc',
+        'browser/policy/policy_map_unittest.cc',
+        'browser/policy/policy_path_parser_unittest.cc',
+        'browser/policy/policy_service_impl_unittest.cc',
+        'browser/policy/policy_statistics_collector_unittest.cc',
+        'browser/policy/preferences_mock_mac.cc',
+        'browser/policy/preferences_mock_mac.h',
+        'browser/policy/preg_parser_win_unittest.cc',
+        'browser/policy/registry_dict_win_unittest.cc',
+        'browser/policy/url_blacklist_manager_unittest.cc',
+        'browser/predictors/autocomplete_action_predictor_table_unittest.cc',
+        'browser/predictors/autocomplete_action_predictor_unittest.cc',
+        'browser/predictors/resource_prefetch_predictor_unittest.cc',
+        'browser/predictors/resource_prefetch_predictor_tables_unittest.cc',
+        'browser/predictors/resource_prefetcher_unittest.cc',
+        'browser/prefs/chrome_pref_service_unittest.cc',
+        'browser/prefs/command_line_pref_store_unittest.cc',
+        'browser/prefs/incognito_mode_prefs_unittest.cc',
+        'browser/prefs/pref_model_associator_unittest.cc',
+        'browser/prefs/proxy_config_dictionary_unittest.cc',
+        'browser/prefs/proxy_policy_unittest.cc',
+        'browser/prefs/proxy_prefs_unittest.cc',
+        'browser/prefs/scoped_user_pref_update_unittest.cc',
+        'browser/prefs/session_startup_pref_unittest.cc',
+        'browser/prerender/prerender_history_unittest.cc',
+        'browser/prerender/prerender_manager_unittest.cc',
+        'browser/prerender/prerender_tracker_unittest.cc',
+        'browser/prerender/prerender_unittest.cc',
+        'browser/prerender/prerender_util_unittest.cc',
+        'browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc',
+        'browser/printing/print_dialog_cloud_unittest.cc',
+        'browser/printing/print_job_unittest.cc',
+        'browser/printing/print_preview_dialog_controller_unittest.cc',
+        'browser/printing/print_preview_test.cc',
+        'browser/printing/print_preview_test.h',
+        'browser/process_info_snapshot_mac_unittest.cc',
+        'browser/process_singleton_linux_unittest.cc',
+        'browser/process_singleton_mac_unittest.cc',
+        'browser/profile_resetter/profile_resetter_unittest.cc',
+        'browser/profiles/avatar_menu_model_unittest.cc',
+        'browser/profiles/gaia_info_update_service_unittest.cc',
+        'browser/profiles/off_the_record_profile_impl_unittest.cc',
+        'browser/profiles/profile_downloader_unittest.cc',
+        'browser/profiles/profile_info_cache_unittest.cc',
+        'browser/profiles/profile_info_cache_unittest.h',
+        'browser/profiles/profile_info_util_unittest.cc',
+        'browser/profiles/profile_loader_unittest.cc',
+        'browser/profiles/profile_manager_unittest.cc',
+        'browser/profiles/profile_shortcut_manager_unittest_win.cc',
+        'browser/renderer_host/plugin_info_message_filter_unittest.cc',
+        'browser/renderer_host/web_cache_manager_unittest.cc',
+        'browser/resources/google_now/background.js',
+        'browser/resources/google_now/cards.js',
+        'browser/resources/google_now/background_test_util.js',
+        'browser/resources/google_now/background_unittest.gtestjs',
+        'browser/resources/google_now/cards_unittest.gtestjs',
+        'browser/resources/print_preview/data/measurement_system.js',
+        'browser/resources/print_preview/data/measurement_system_unittest.gtestjs',
+        'browser/resources/print_preview/print_preview_utils.js',
+        'browser/resources/print_preview/print_preview_utils_unittest.gtestjs',
+        'browser/resources_util_unittest.cc',
+        'browser/rlz/rlz_unittest.cc',
+        'browser/safe_browsing/browser_feature_extractor_unittest.cc',
+        'browser/safe_browsing/chunk_range_unittest.cc',
+        'browser/safe_browsing/client_side_detection_host_unittest.cc',
+        'browser/safe_browsing/client_side_detection_service_unittest.cc',
+        'browser/safe_browsing/download_feedback_service_unittest.cc',
+        'browser/safe_browsing/download_feedback_unittest.cc',
+        'browser/safe_browsing/download_protection_service_unittest.cc',
+        'browser/safe_browsing/local_two_phase_testserver.cc',
+        'browser/safe_browsing/malware_details_unittest.cc',
+        'browser/safe_browsing/ping_manager_unittest.cc',
+        'browser/safe_browsing/prefix_set_unittest.cc',
+        'browser/safe_browsing/protocol_manager_unittest.cc',
+        'browser/safe_browsing/protocol_parser_unittest.cc',
+        'browser/safe_browsing/safe_browsing_blocking_page_unittest.cc',
+        'browser/safe_browsing/safe_browsing_database_unittest.cc',
+        'browser/safe_browsing/safe_browsing_store_file_unittest.cc',
+        'browser/safe_browsing/safe_browsing_store_unittest.cc',
+        'browser/safe_browsing/safe_browsing_store_unittest_helper.cc',
+        'browser/safe_browsing/safe_browsing_util_unittest.cc',
+        'browser/safe_browsing/signature_util_win_unittest.cc',
+        'browser/safe_browsing/two_phase_uploader_unittest.cc',
+        'browser/search/iframe_source_unittest.cc',
+        'browser/search/most_visited_iframe_source_unittest.cc',
+        'browser/search/search_unittest.cc',
+        'browser/search_engines/search_host_to_urls_map_unittest.cc',
+        'browser/search_engines/search_provider_install_data_unittest.cc',
+        'browser/search_engines/template_url_fetcher_unittest.cc',
+        'browser/search_engines/template_url_service_util_unittest.cc',
+        'browser/search_engines/template_url_service_sync_unittest.cc',
+        'browser/search_engines/template_url_service_unittest.cc',
+        'browser/search_engines/template_url_parser_unittest.cc',
+        'browser/search_engines/template_url_prepopulate_data_unittest.cc',
+        'browser/search_engines/template_url_scraper_unittest.cc',
+        'browser/search_engines/template_url_unittest.cc',
+        'browser/sessions/session_backend_unittest.cc',
+        'browser/sessions/session_service_unittest.cc',
+        'browser/sessions/session_types_unittest.cc',
+        'browser/shell_integration_unittest.cc',
+        'browser/shell_integration_win_unittest.cc',
+        'browser/signin/fake_auth_status_provider.cc',
+        'browser/signin/fake_auth_status_provider.h',
+        'browser/signin/oauth2_token_service_test_util.cc',
+        'browser/signin/oauth2_token_service_test_util.h',
+        'browser/signin/oauth2_token_service_unittest.cc',
+        'browser/signin/profile_oauth2_token_service_request_unittest.cc',
+        'browser/signin/profile_oauth2_token_service_unittest.cc',
+        'browser/signin/signin_global_error_unittest.cc',
+        'browser/signin/signin_manager_unittest.cc',
+        'browser/signin/signin_names_io_thread_unittest.cc',
+        'browser/signin/signin_tracker_unittest.cc',
+        'browser/signin/token_service_unittest.cc',
+        'browser/signin/token_service_unittest.h',
+        'browser/signin/ubertoken_fetcher_unittest.cc',
+        'browser/speech/extension_api/extension_manifests_tts_unittest.cc',
+        'browser/speech/speech_recognition_bubble_controller_unittest.cc',
+        'browser/speech/tts_controller_unittest.cc',
+        'browser/spellchecker/feedback_sender_unittest.cc',
+        'browser/spellchecker/feedback_unittest.cc',
+        'browser/spellchecker/misspelling_unittest.cc',
+        'browser/spellchecker/spellcheck_action_unittest.cc',
+        'browser/spellchecker/spellcheck_custom_dictionary_unittest.cc',
+        'browser/spellchecker/spellcheck_host_metrics_unittest.cc',
+        'browser/spellchecker/spellcheck_message_filter_mac_unittest.cc',
+        'browser/spellchecker/spellcheck_message_filter_unittest.cc',
+        'browser/spellchecker/spellcheck_platform_mac_unittest.cc',
+        'browser/spellchecker/spellcheck_service_unittest.cc',
+        'browser/spellchecker/spelling_service_client_unittest.cc',
+        'browser/spellchecker/word_trimmer_unittest.cc',
+        'browser/status_icons/status_icon_unittest.cc',
+        'browser/status_icons/status_tray_unittest.cc',
+        'browser/storage_monitor/image_capture_device_manager_unittest.mm',
+        'browser/storage_monitor/media_storage_util_unittest.cc',
+        'browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc',
+        'browser/storage_monitor/mock_removable_storage_observer.cc',
+        'browser/storage_monitor/mock_removable_storage_observer.h',
+        'browser/storage_monitor/storage_info_unittest.cc',
+        'browser/storage_monitor/storage_monitor_chromeos_unittest.cc',
+        'browser/storage_monitor/storage_monitor_linux_unittest.cc',
+        'browser/storage_monitor/storage_monitor_mac_unittest.mm',
+        'browser/storage_monitor/storage_monitor_win_unittest.cc',
+        'browser/storage_monitor/storage_monitor_unittest.cc',
+        'browser/storage_monitor/test_portable_device_watcher_win.cc',
+        'browser/storage_monitor/test_portable_device_watcher_win.h',
+        'browser/storage_monitor/test_storage_monitor_win.cc',
+        'browser/storage_monitor/test_storage_monitor_win.h',
+        'browser/storage_monitor/test_volume_mount_watcher_win.cc',
+        'browser/storage_monitor/test_volume_mount_watcher_win.h',
+        'browser/sync/about_sync_util_unittest.cc',
+        'browser/sync/abstract_profile_sync_service_test.cc',
+        'browser/sync/abstract_profile_sync_service_test.h',
+        'browser/sync/backend_migrator_unittest.cc',
+        'browser/sync/glue/autofill_data_type_controller_unittest.cc',
+        'browser/sync/glue/bookmark_data_type_controller_unittest.cc',
+        'browser/sync/glue/browser_thread_model_worker_unittest.cc',
+        'browser/sync/glue/change_processor_mock.cc',
+        'browser/sync/glue/change_processor_mock.h',
+        'browser/sync/glue/chrome_encryptor_unittest.cc',
+        'browser/sync/glue/data_type_controller_mock.cc',
+        'browser/sync/glue/data_type_controller_mock.h',
+        'browser/sync/glue/data_type_error_handler_mock.cc',
+        'browser/sync/glue/data_type_error_handler_mock.h',
+        'browser/sync/glue/data_type_manager_impl_unittest.cc',
+        'browser/sync/glue/data_type_manager_mock.cc',
+        'browser/sync/glue/data_type_manager_mock.h',
+        'browser/sync/glue/extensions_activity_monitor_unittest.cc',
+        'browser/sync/glue/fake_data_type_controller.cc',
+        'browser/sync/glue/fake_data_type_controller.h',
+        'browser/sync/glue/fake_generic_change_processor.cc',
+        'browser/sync/glue/fake_generic_change_processor.h',
+        'browser/sync/glue/favicon_cache_unittest.cc',
+        'browser/sync/glue/frontend_data_type_controller_mock.cc',
+        'browser/sync/glue/frontend_data_type_controller_mock.h',
+        'browser/sync/glue/frontend_data_type_controller_unittest.cc',
+        'browser/sync/glue/generic_change_processor_unittest.cc',
+        'browser/sync/glue/model_association_manager_unittest.cc',
+        'browser/sync/glue/model_associator_mock.cc',
+        'browser/sync/glue/model_associator_mock.h',
+        'browser/sync/glue/non_frontend_data_type_controller_mock.cc',
+        'browser/sync/glue/non_frontend_data_type_controller_mock.h',
+        'browser/sync/glue/non_frontend_data_type_controller_unittest.cc',
+        'browser/sync/glue/non_ui_data_type_controller_mock.cc',
+        'browser/sync/glue/non_ui_data_type_controller_mock.h',
+        'browser/sync/glue/non_ui_data_type_controller_unittest.cc',
+        'browser/sync/glue/search_engine_data_type_controller_unittest.cc',
+        'browser/sync/glue/session_model_associator_unittest.cc',
+        'browser/sync/glue/shared_change_processor_mock.cc',
+        'browser/sync/glue/shared_change_processor_mock.h',
+        'browser/sync/glue/shared_change_processor_unittest.cc',
+        'browser/sync/glue/sync_backend_host_unittest.cc',
+        'browser/sync/glue/sync_backend_registrar_unittest.cc',
+        'browser/sync/glue/synced_device_tracker_unittest.cc',
+        'browser/sync/glue/synced_session_tracker_unittest.cc',
+        'browser/sync/glue/tab_node_pool_unittest.cc',
+        'browser/sync/glue/typed_url_model_associator_unittest.cc',
+        'browser/sync/glue/ui_data_type_controller_unittest.cc',
+        'browser/sync/glue/ui_model_worker_unittest.cc',
+        'browser/sync/profile_sync_components_factory_impl_unittest.cc',
+        'browser/sync/profile_sync_components_factory_mock.cc',
+        'browser/sync/profile_sync_components_factory_mock.h',
+        'browser/sync/profile_sync_service_autofill_unittest.cc',
+        'browser/sync/profile_sync_service_bookmark_unittest.cc',
+        'browser/sync/profile_sync_service_password_unittest.cc',
+        'browser/sync/profile_sync_service_preference_unittest.cc',
+        'browser/sync/profile_sync_service_session_unittest.cc',
+        'browser/sync/profile_sync_service_startup_unittest.cc',
+        'browser/sync/profile_sync_service_typed_url_unittest.cc',
+        'browser/sync/profile_sync_service_unittest.cc',
+        'browser/sync/profile_sync_test_util.cc',
+        'browser/sync/profile_sync_test_util.h',
+        'browser/sync/sync_global_error_unittest.cc',
+        'browser/sync/sync_prefs_unittest.cc',
+        'browser/sync/sync_startup_tracker_unittest.cc',
+        'browser/sync/sync_ui_util_unittest.cc',
+        'browser/sync/test/test_http_bridge_factory.cc',
+        'browser/sync/test/test_http_bridge_factory.h',
+        'browser/sync/test_profile_sync_service.cc',
+        'browser/sync/test_profile_sync_service.h',
+        'browser/sync_file_system/drive_backend/api_util_unittest.cc',
+        'browser/sync_file_system/drive_backend/drive_file_sync_service_fake_unittest.cc',
+        'browser/sync_file_system/drive_backend/drive_file_sync_service_sync_unittest.cc',
+        'browser/sync_file_system/drive_backend/drive_file_sync_service_unittest.cc',
+        'browser/sync_file_system/drive_backend/drive_metadata_store_unittest.cc',
+        'browser/sync_file_system/drive_backend/fake_api_util.cc',
+        'browser/sync_file_system/drive_backend/fake_api_util.h',
+        'browser/sync_file_system/drive_backend/fake_api_util_unittest.cc',
+        'browser/sync_file_system/drive_backend/fake_drive_service_helper.cc',
+        'browser/sync_file_system/drive_backend/fake_drive_service_helper.h',
+        'browser/sync_file_system/drive_backend/local_sync_operation_resolver_unittest.cc',
+        'browser/sync_file_system/drive_backend/metadata_database_unittest.cc',
+        'browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc',
+        'browser/sync_file_system/drive_backend/remote_sync_operation_resolver_unittest.cc',
+        'browser/sync_file_system/fake_remote_change_processor.cc',
+        'browser/sync_file_system/fake_remote_change_processor.h',
+        'browser/sync_file_system/file_change_unittest.cc',
+        'browser/sync_file_system/local/canned_syncable_file_system.cc',
+        'browser/sync_file_system/local/canned_syncable_file_system.h',
+        'browser/sync_file_system/local/local_file_change_tracker_unittest.cc',
+        'browser/sync_file_system/local/local_file_sync_context_unittest.cc',
+        'browser/sync_file_system/local/local_file_sync_service_unittest.cc',
+        'browser/sync_file_system/local/local_file_sync_status_unittest.cc',
+        'browser/sync_file_system/local/mock_sync_status_observer.cc',
+        'browser/sync_file_system/local/mock_sync_status_observer.h',
+        'browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc',
+        'browser/sync_file_system/local/syncable_file_system_unittest.cc',
+        'browser/sync_file_system/logger_unittest.cc',
+        'browser/sync_file_system/mock_local_change_processor.cc',
+        'browser/sync_file_system/mock_local_change_processor.h',
+        'browser/sync_file_system/mock_remote_change_processor.cc',
+        'browser/sync_file_system/mock_remote_change_processor.h',
+        'browser/sync_file_system/mock_remote_file_sync_service.cc',
+        'browser/sync_file_system/mock_remote_file_sync_service.h',
+        'browser/sync_file_system/sync_file_system_service_unittest.cc',
+        'browser/sync_file_system/sync_file_system_test_util.cc',
+        'browser/sync_file_system/sync_file_system_test_util.h',
+        'browser/sync_file_system/sync_task_manager_unittest.cc',
+        'browser/sync_file_system/syncable_file_system_util_unittest.cc',
+        'browser/tab_contents/render_view_context_menu_test_util.cc',
+        'browser/tab_contents/render_view_context_menu_test_util.h',
+        'browser/tab_contents/render_view_context_menu_unittest.cc',
+        'browser/task_manager/task_manager_unittest.cc',
+        'browser/task_profiler/task_profiler_data_serializer_unittest.cc',
+        'browser/themes/browser_theme_pack_unittest.cc',
+        'browser/themes/theme_properties_unittest.cc',
+        'browser/themes/theme_service_unittest.cc',
+        'browser/themes/theme_syncable_service_unittest.cc',
+        'browser/thumbnails/content_analysis_unittest.cc',
+        'browser/thumbnails/content_based_thumbnailing_algorithm_unittest.cc',
+        'browser/thumbnails/render_widget_snapshot_taker_unittest.cc',
+        'browser/thumbnails/simple_thumbnail_crop_unittest.cc',
+        'browser/thumbnails/thumbnail_service_unittest.cc',
+        'browser/translate/translate_browser_metrics_unittest.cc',
+        'browser/translate/translate_manager_unittest.cc',
+        'browser/translate/translate_prefs_unittest.cc',
+        'browser/ui/android/tab_model/tab_model_unittest.cc',
+        'browser/ui/ash/event_rewriter_unittest.cc',
+        'browser/ui/ash/ime_controller_chromeos_unittest.cc',
+        'browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc',
+        'browser/ui/ash/launcher/launcher_context_menu_unittest.cc',
+        'browser/ui/ash/screenshot_taker_unittest.cc',
+        'browser/ui/ash/window_positioner_unittest.cc',
+        'browser/ui/autofill/account_chooser_model_unittest.cc',
+        'browser/ui/autofill/autocheckout_bubble_controller_unittest.cc',
+        'browser/ui/autofill/autofill_dialog_controller_unittest.cc',
+        'browser/ui/autofill/autofill_dialog_models_unittest.cc',
+        'browser/ui/autofill/autofill_dialog_types_unittest.cc',
+        'browser/ui/autofill/autofill_popup_controller_unittest.cc',
+        'browser/ui/autofill/data_model_wrapper_unittest.cc',
+        'browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc',
+        'browser/ui/autofill/mock_autofill_dialog_view_delegate.cc',
+        'browser/ui/autofill/mock_autofill_dialog_view_delegate.h',
+        'browser/ui/autofill/mock_new_credit_card_bubble_controller.cc',
+        'browser/ui/autofill/mock_new_credit_card_bubble_controller.h',
+        'browser/ui/autofill/test_generated_credit_card_bubble_view.cc',
+        'browser/ui/autofill/test_generated_credit_card_bubble_view.h',
+        'browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc',
+        'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc',
+        'browser/ui/bookmarks/bookmark_editor_unittest.cc',
+        'browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc',
+        'browser/ui/bookmarks/bookmark_ui_utils_unittest.cc',
+        'browser/ui/bookmarks/bookmark_unittest.cc',
+        'browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc',
+        'browser/ui/browser_command_controller_unittest.cc',
+        'browser/ui/browser_iterator_unittest.cc',
+        'browser/ui/browser_unittest.cc',
+        'browser/ui/chrome_select_file_policy_unittest.cc',
+        # It is safe to list */cocoa/* files in the "common" file list
+        # without an explicit exclusion since gyp is smart enough to
+        # exclude them from non-Mac builds.
+        'browser/ui/cocoa/about_ipc_controller_unittest.mm',
+        'browser/ui/cocoa/accelerators_cocoa_unittest.mm',
+        'browser/ui/cocoa/animatable_image_unittest.mm',
+        'browser/ui/cocoa/animatable_view_unittest.mm',
+        'browser/ui/cocoa/applescript/apple_event_util_unittest.mm',
+        'browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h',
+        'browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm',
+        'browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm',
+        'browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_details_container_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_main_container_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_notification_container_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_notification_controller_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_pop_up_button_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_textfield_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_section_container_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_section_view_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_sign_in_container_unittest.mm',
+        'browser/ui/cocoa/autofill/autofill_suggestion_container_unittest.mm',
+        'browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm',
+        'browser/ui/cocoa/autofill/layout_view_unittest.mm',
+        'browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm',
+        'browser/ui/cocoa/background_gradient_view_unittest.mm',
+        'browser/ui/cocoa/base_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm',
+        'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm',
+        'browser/ui/cocoa/browser/avatar_button_controller_unittest.mm',
+        'browser/ui/cocoa/browser/avatar_label_button_unittest.mm',
+        'browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm',
+        'browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/browser_window_cocoa_unittest.mm',
+        'browser/ui/cocoa/browser_window_controller_unittest.mm',
+        'browser/ui/cocoa/bubble_view_unittest.mm',
+        'browser/ui/cocoa/chrome_browser_window_unittest.mm',
+        'browser/ui/cocoa/chrome_event_processing_window_unittest.mm',
+        'browser/ui/cocoa/clickhold_button_cell_unittest.mm',
+        'browser/ui/cocoa/cocoa_profile_test.h',
+        'browser/ui/cocoa/cocoa_profile_test.mm',
+        'browser/ui/cocoa/cocoa_test_helper.h',
+        'browser/ui/cocoa/cocoa_test_helper.mm',
+        'browser/ui/cocoa/command_observer_bridge_unittest.mm',
+        'browser/ui/cocoa/confirm_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_animation_unittest.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_button_unittest.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_custom_window_unittest.mm',
+        'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm',
+        'browser/ui/cocoa/content_settings/cookie_details_unittest.mm',
+        'browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm',
+        'browser/ui/cocoa/custom_frame_view_unittest.mm',
+        'browser/ui/cocoa/download/download_item_button_unittest.mm',
+        'browser/ui/cocoa/download/download_item_cell_unittest.mm',
+        'browser/ui/cocoa/download/download_shelf_controller_unittest.mm',
+        'browser/ui/cocoa/download/download_shelf_mac_unittest.mm',
+        'browser/ui/cocoa/download/download_shelf_view_unittest.mm',
+        'browser/ui/cocoa/download/download_util_mac_unittest.mm',
+        'browser/ui/cocoa/draggable_button_unittest.mm',
+        'browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm',
+        'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h',
+        'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm',
+        'browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm',
+        'browser/ui/cocoa/fast_resize_view_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_view_unittest.mm',
+        'browser/ui/cocoa/find_pasteboard_unittest.mm',
+        'browser/ui/cocoa/first_run_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/floating_bar_backing_view_unittest.mm',
+        'browser/ui/cocoa/framed_browser_window_unittest.mm',
+        'browser/ui/cocoa/fullscreen_window_unittest.mm',
+        'browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/gradient_button_cell_unittest.mm',
+        'browser/ui/cocoa/history_menu_bridge_unittest.mm',
+        'browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm',
+        'browser/ui/cocoa/history_overlay_controller_unittest.mm',
+        'browser/ui/cocoa/hover_close_button_unittest.mm',
+        'browser/ui/cocoa/hung_renderer_controller_unittest.mm',
+        'browser/ui/cocoa/hyperlink_text_view_unittest.mm',
+        'browser/ui/cocoa/image_button_cell_unittest.mm',
+        'browser/ui/cocoa/info_bubble_view_unittest.mm',
+        'browser/ui/cocoa/info_bubble_window_unittest.mm',
+        'browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm',
+        'browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm',
+        'browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm',
+        'browser/ui/cocoa/infobars/translate_infobar_unittest.mm',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm',
+        'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.mm',
+        'browser/ui/cocoa/location_bar/ev_bubble_decoration_unittest.mm',
+        'browser/ui/cocoa/location_bar/image_decoration_unittest.mm',
+        'browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm',
+        'browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm',
+        'browser/ui/cocoa/menu_button_unittest.mm',
+        'browser/ui/cocoa/nine_part_button_cell_unittest.mm',
+        'browser/ui/cocoa/notifications/balloon_controller_unittest.mm',
+        'browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm',
+        'browser/ui/cocoa/nsmenuitem_additions_unittest.mm',
+        'browser/ui/cocoa/nsview_additions_unittest.mm',
+        'browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm',
+        'browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm',
+        'browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm',
+        'browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm',
+        'browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm',
+        'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/panels/panel_cocoa_unittest.mm',
+        'browser/ui/cocoa/profile_menu_controller_unittest.mm',
+        'browser/ui/cocoa/run_loop_testing_unittest.mm',
+        'browser/ui/cocoa/status_bubble_mac_unittest.mm',
+        'browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm',
+        'browser/ui/cocoa/styled_text_field_cell_unittest.mm',
+        'browser/ui/cocoa/styled_text_field_test_helper.h',
+        'browser/ui/cocoa/styled_text_field_test_helper.mm',
+        'browser/ui/cocoa/styled_text_field_unittest.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm',
+        'browser/ui/cocoa/table_row_nsimage_cache_unittest.mm',
+        'browser/ui/cocoa/tabpose_window_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_audio_indicator_view_mac_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_controller_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_projecting_image_view_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_strip_view_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_view_unittest.mm',
+        'browser/ui/cocoa/tabs/throbber_view_unittest.mm',
+        'browser/ui/cocoa/tabs/throbbing_image_view_unittest.mm',
+        'browser/ui/cocoa/task_manager_mac_unittest.mm',
+        'browser/ui/cocoa/toolbar/reload_button_unittest.mm',
+        'browser/ui/cocoa/toolbar/toolbar_button_unittest.mm',
+        'browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm',
+        'browser/ui/cocoa/toolbar/toolbar_view_unittest.mm',
+        'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell_unittest.mm',
+        'browser/ui/cocoa/vertical_gradient_view_unittest.mm',
+        'browser/ui/cocoa/validation_message_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/view_resizer_pong.h',
+        'browser/ui/cocoa/view_resizer_pong.mm',
+        'browser/ui/cocoa/website_settings_bubble_controller_unittest.mm',
+        'browser/ui/cocoa/web_dialog_window_controller_unittest.mm',
+        'browser/ui/cocoa/window_size_autosaver_unittest.mm',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm',
+        'browser/ui/content_settings/content_setting_bubble_model_unittest.cc',
+        'browser/ui/content_settings/content_setting_image_model_unittest.cc',
+        'browser/ui/find_bar/find_backend_unittest.cc',
+        'browser/ui/fullscreen/fullscreen_controller_state_unittest.cc',
+        'browser/ui/global_error/global_error_service_unittest.cc',
+        'browser/ui/gtk/accelerators_gtk_unittest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc',
+        'browser/ui/gtk/event_utils_unittest.cc',
+        'browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc',
+        'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
+        'browser/ui/gtk/gtk_theme_service_unittest.cc',
+        'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc',
+        'browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc',
+        'browser/ui/gtk/reload_button_gtk_unittest.cc',
+        'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
+        'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
+        'browser/ui/login/login_prompt_unittest.cc',
+        'browser/ui/omnibox/omnibox_controller_unittest.cc',
+        'browser/ui/omnibox/omnibox_edit_unittest.cc',
+        'browser/ui/omnibox/omnibox_view_unittest.cc',
+        'browser/ui/panels/display_settings_provider_win_unittest.cc',
+        'browser/ui/panels/panel_mouse_watcher_unittest.cc',
+        'browser/ui/search_engines/keyword_editor_controller_unittest.cc',
+        'browser/ui/search/instant_ntp_prerenderer_unittest.cc',
+        'browser/ui/search/instant_page_unittest.cc',
+        'browser/ui/search/search_delegate_unittest.cc',
+        'browser/ui/search/search_model_unittest.cc',
+        'browser/ui/startup/session_crashed_infobar_delegate_unittest.cc',
+        'browser/ui/sync/one_click_signin_helper_unittest.cc',
+        'browser/ui/sync/one_click_signin_sync_starter_unittest.cc',
+        'browser/ui/sync/profile_signin_confirmation_helper_unittest.cc',
+        'browser/ui/sync/sync_promo_ui_unittest.cc',
+        'browser/ui/tab_contents/tab_contents_iterator_unittest.cc',
+        'browser/ui/tabs/dock_info_unittest.cc',
+        'browser/ui/tabs/pinned_tab_codec_unittest.cc',
+        'browser/ui/tabs/pinned_tab_service_unittest.cc',
+        'browser/ui/tabs/pinned_tab_test_utils.cc',
+        'browser/ui/tabs/tab_audio_indicator_unittest.cc',
+        'browser/ui/tabs/tab_menu_model_unittest.cc',
+        'browser/ui/tabs/tab_strip_model_unittest.cc',
+        'browser/ui/tabs/test_tab_strip_model_delegate.cc',
+        'browser/ui/tabs/test_tab_strip_model_delegate.h',
+        'browser/ui/tests/ui_gfx_image_unittest.cc',
+        'browser/ui/tests/ui_gfx_image_unittest.mm',
+        'browser/ui/toolbar/back_forward_menu_model_unittest.cc',
+        'browser/ui/toolbar/encoding_menu_controller_unittest.cc',
+        'browser/ui/toolbar/recent_tabs_builder_test_helper.cc',
+        'browser/ui/toolbar/recent_tabs_builder_test_helper.h',
+        'browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc',
+        'browser/ui/toolbar/toolbar_model_unittest.cc',
+        'browser/ui/toolbar/test_toolbar_model.cc',
+        'browser/ui/toolbar/test_toolbar_model.h',
+        'browser/ui/toolbar/wrench_icon_painter_unittest.cc',
+        'browser/ui/toolbar/wrench_menu_model_unittest.cc',
+        'browser/ui/views/accelerator_table_unittest.cc',
+        'browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc',
+        'browser/ui/views/autofill/decorated_textfield_unittest.cc',
+        'browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc',
+        'browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc',
+        'browser/ui/views/bookmarks/bookmark_context_menu_test.cc',
+        'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
+        'browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc',
+        'browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc',
+        'browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc',
+        'browser/ui/views/confirm_bubble_views_unittest.cc',
+        'browser/ui/views/crypto_module_password_dialog_view_unittest.cc',
+        'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
+        'browser/ui/views/first_run_bubble_unittest.cc',
+        'browser/ui/views/frame/browser_view_layout_unittest.cc',
+        'browser/ui/views/frame/browser_view_unittest.cc',
+        'browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc',
+        'browser/ui/views/reload_button_unittest.cc',
+        'browser/ui/views/select_file_dialog_extension_unittest.cc',
+        'browser/ui/views/status_icons/status_tray_win_unittest.cc',
+        'browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc',
+        'browser/ui/views/tabs/fake_base_tab_strip_controller.cc',
+        'browser/ui/views/tabs/fake_base_tab_strip_controller.h',
+        'browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc',
+        'browser/ui/views/tabs/tab_unittest.cc',
+        'browser/ui/views/tabs/tab_strip_unittest.cc',
+        'browser/ui/views/validation_message_bubble_delegate_unittest.cc',
+        'browser/ui/website_settings/website_settings_unittest.cc',
+        'browser/ui/webui/fileicon_source_unittest.cc',
+        'browser/ui/webui/history_ui_unittest.cc',
+        'browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc',
+        'browser/ui/webui/ntp/suggestions_combiner_unittest.cc',
+        'browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc',
+        'browser/ui/webui/options/language_options_handler_unittest.cc',
+        'browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc',
+        'browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc',
+        'browser/ui/webui/print_preview/print_preview_ui_unittest.cc',
+        'browser/ui/webui/signin/login_ui_service_unittest.cc',
+        'browser/ui/webui/sync_internals_ui_unittest.cc',
+        'browser/ui/webui/sync_setup_handler_unittest.cc',
+        'browser/ui/webui/theme_source_unittest.cc',
+        'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc',
+        'browser/ui/window_sizer/window_sizer_ash_unittest.cc',
+        'browser/ui/window_sizer/window_sizer_common_unittest.cc',
+        'browser/ui/window_sizer/window_sizer_unittest.cc',
+        'browser/ui/zoom/zoom_controller_unittest.cc',
+        'browser/upload_list_unittest.cc',
+        'browser/chrome_content_browser_client_unittest.cc',
+        'browser/undo/undo_manager_test.cc',
+        'browser/usb/usb_context_unittest.cc',
+        'browser/user_style_sheet_watcher_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/web_applications/web_app_mac_unittest.mm',
+        'browser/web_applications/web_app_unittest.cc',
+        'browser/web_resource/eula_accepted_notifier_unittest.cc',
+        'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc',
+        'browser/web_resource/promo_resource_service_unittest.cc',
+        'browser/web_resource/resource_request_allowed_notifier_test_util.cc',
+        'browser/web_resource/resource_request_allowed_notifier_test_util.h',
+        'browser/web_resource/resource_request_allowed_notifier_unittest.cc',
+        'browser/webdata/autofill_profile_syncable_service_unittest.cc',
+        'browser/webdata/keyword_table_unittest.cc',
+        'browser/webdata/token_service_table_unittest.cc',
+        'browser/webdata/web_apps_table_unittest.cc',
+        'common/cancelable_task_tracker_unittest.cc',
+        'common/child_process_logging_mac_unittest.mm',
+        'common/chrome_paths_unittest.cc',
+        'common/cloud_print/cloud_print_helpers_unittest.cc',
+        'common/chrome_content_client_unittest.cc',
+        'common/content_settings_helper_unittest.cc',
+        'common/content_settings_pattern_parser_unittest.cc',
+        'common/content_settings_pattern_unittest.cc',
+        'common/extensions/api/commands/commands_manifest_unittest.cc',
+        'common/extensions/api/extension_action/browser_action_manifest_unittest.cc',
+        'common/extensions/api/extension_action/page_action_manifest_unittest.cc',
+        'common/extensions/api/extension_action/script_badge_manifest_unittest.cc',
+        'common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc',
+        'common/extensions/api/i18n/default_locale_manifest_unittest.cc',
+        'common/extensions/api/identity/extension_manifests_auth_unittest.cc',
+        'common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc',
+        'common/extensions/command_unittest.cc',
+        'common/extensions/csp_validator_unittest.cc',
+        'common/extensions/extension_file_util_unittest.cc',
+        'common/extensions/extension_icon_set_unittest.cc',
+        'common/extensions/extension_l10n_util_unittest.cc',
+        'common/extensions/extension_set_unittest.cc',
+        'common/extensions/extension_unittest.cc',
+        'common/extensions/feature_switch_unittest.cc',
+        'common/extensions/features/base_feature_provider_unittest.cc',
+        'common/extensions/features/complex_feature_unittest.cc',
+        'common/extensions/features/simple_feature_unittest.cc',
+        'common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc',
+        'common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc',
+        'common/extensions/manifest_handlers/externally_connectable_unittest.cc',
+        'common/extensions/manifest_handlers/shared_module_manifest_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifest_test.cc',
+        'common/extensions/manifest_tests/extension_manifests_background_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_contentsecuritypolicy_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_dummy_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_icons_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_launch_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_offline_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_old_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_options_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_override_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_portsinpermissions_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_sandboxed_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_storage_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_ui_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_update_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc',
+        'common/extensions/manifest_tests/extension_manifests_web_unittest.cc',
+        'common/extensions/manifest_unittest.cc',
+        'common/extensions/manifest_handler_unittest.cc',
+        'common/extensions/message_bundle_unittest.cc',
+        'common/extensions/permissions/api_permission_set_unittest.cc',
+        'common/extensions/permissions/media_galleries_permission_unittest.cc',
+        'common/extensions/permissions/permission_set_unittest.cc',
+        'common/extensions/permissions/permissions_data_unittest.cc',
+        'common/extensions/permissions/socket_permission_unittest.cc',
+        'common/extensions/permissions/usb_device_permission_unittest.cc',
+        'common/extensions/sync_type_unittest.cc',
+        'common/extensions/update_manifest_unittest.cc',
+        'common/extensions/value_counter_unittest.cc',
+        'common/extensions/api/extension_api_unittest.cc',
+        'common/favicon/favicon_url_parser_unittest.cc',
+        'common/importer/firefox_importer_utils_unittest.cc',
+        'common/instant_restricted_id_cache_unittest.cc',
+        'common/mac/cfbundle_blocker_unittest.mm',
+        'common/mac/mock_launchd.cc',
+        'common/mac/mock_launchd.h',
+        'common/mac/nscoder_util_unittest.mm',
+        'common/mac/objc_method_swizzle_unittest.mm',
+        'common/mac/objc_zombie_unittest.mm',
+        'common/metrics/caching_permuted_entropy_provider_unittest.cc',
+        'common/metrics/entropy_provider_unittest.cc',
+        'common/metrics/metrics_log_base_unittest.cc',
+        'common/metrics/metrics_log_manager_unittest.cc',
+        'common/metrics/metrics_util_unittest.cc',
+        'common/metrics/variations/variations_associated_data_unittest.cc',
+        'common/metrics/variations/variations_util_unittest.cc',
+        'common/multi_process_lock_unittest.cc',
+        'common/net/url_fixer_upper_unittest.cc',
+        'common/net/x509_certificate_model_unittest.cc',
+        'common/partial_circular_buffer_unittest.cc',
+        'common/pref_names_util_unittest.cc',
+        'common/service_process_util_unittest.cc',
+        'common/switch_utils_unittest.cc',
+        'common/thumbnail_score_unittest.cc',
+        'common/translate/language_detection_util_unittest.cc',
+        'common/translate/translate_common_metrics_unittest.cc',
+        'common/translate/translate_util_unittest.cc',
+        'common/worker_thread_ticker_unittest.cc',
+        'renderer/chrome_content_renderer_client_unittest.cc',
+        'renderer/content_settings_observer_unittest.cc',
+        'renderer/extensions/activity_log_converter_strategy_unittest.cc',
+        'renderer/extensions/chrome_v8_context_set_unittest.cc',
+        'renderer/extensions/event_unittest.cc',
+        'renderer/extensions/extension_localization_peer_unittest.cc',
+        'renderer/extensions/json_schema_unittest.cc',
+        'renderer/extensions/module_system_unittest.cc',
+        'renderer/extensions/renderer_permissions_policy_delegate_unittest.cc',
+        'renderer/extensions/safe_builtins_unittest.cc',
+        'renderer/media/chrome_webrtc_log_message_delegate_unittest.cc',
+        'renderer/net/net_error_helper_unittest.cc',
+        'renderer/net/predictor_queue_unittest.cc',
+        'renderer/net/renderer_predictor_unittest.cc',
+        'renderer/plugins/plugin_uma_unittest.cc',
+        'renderer/prerender/prerender_dispatcher_unittest.cc',
+        'renderer/safe_browsing/features_unittest.cc',
+        'renderer/safe_browsing/murmurhash3_util_unittest.cc',
+        'renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc',
+        'renderer/safe_browsing/phishing_url_feature_extractor_unittest.cc',
+        'renderer/safe_browsing/scorer_unittest.cc',
+        'renderer/searchbox/searchbox_extension_unittest.cc',
+        'renderer/searchbox/searchbox_unittest.cc',
+        'renderer/spellchecker/custom_dictionary_engine_unittest.cc',
+        'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
+        'renderer/spellchecker/spellcheck_provider_mac_unittest.cc',
+        'renderer/spellchecker/spellcheck_provider_test.cc',
+        'renderer/spellchecker/spellcheck_provider_test.h',
+        'renderer/spellchecker/spellcheck_unittest.cc',
+        'renderer/spellchecker/spellcheck_worditerator_unittest.cc',
+        'renderer/web_apps_unittest.cc',
+        'service/cloud_print/cloud_print_helpers_unittest.cc',
+        'service/cloud_print/cloud_print_token_store_unittest.cc',
+        'service/cloud_print/cloud_print_url_fetcher_unittest.cc',
+        'service/cloud_print/connector_settings_unittest.cc',
+        'service/cloud_print/printer_job_handler_unittest.cc',
+        'service/cloud_print/printer_job_queue_handler_unittest.cc',
+        'service/service_process_prefs_unittest.cc',
+        'service/service_process_unittest.cc',
+        'test/base/browser_with_test_window_test.cc',
+        'test/base/browser_with_test_window_test.h',
+        'test/base/chrome_render_view_test.cc',
+        'test/base/chrome_render_view_test.h',
+        'test/base/menu_model_test.cc',
+        'test/base/menu_model_test.h',
+        'test/base/v8_unit_test.cc',
+        'test/base/v8_unit_test.h',
+        'test/data/resource.rc',
+        'test/data/unit/framework_unittest.gtestjs',
+        'test/logging/win/mof_data_parser_unittest.cc',
+        'tools/convert_dict/convert_dict_unittest.cc',
+        'utility/extensions/unpacker_unittest.cc',
+        'utility/importer/bookmark_html_reader_unittest.cc',
+        'utility/importer/bookmarks_file_importer_unittest.cc',
+        'utility/importer/firefox_importer_unittest.cc',
+        'utility/importer/safari_importer_unittest.mm',
+
+        # Duplicate these tests here because PathService has more items in
+        # unit_tests than in base_unittests.
+        '../base/path_service_unittest.cc',
+
+        # TODO(joi): Move to //components/components_tests.gypi once
+        # remaining dependencies back to //chrome are eliminated.
+        '../components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc',
+        '../components/autofill/content/browser/autocheckout_manager_unittest.cc',
+        '../components/autofill/content/browser/autocheckout_page_meta_data_unittest.cc',
+        '../components/autofill/content/browser/autofill_driver_impl_unittest.cc',
+        '../components/autofill/content/browser/wallet/full_wallet_unittest.cc',
+        '../components/autofill/content/browser/wallet/instrument_unittest.cc',
+        '../components/autofill/content/browser/wallet/wallet_address_unittest.cc',
+        '../components/autofill/content/browser/wallet/wallet_client_unittest.cc',
+        '../components/autofill/content/browser/wallet/wallet_items_unittest.cc',
+        '../components/autofill/content/browser/wallet/wallet_service_url_unittest.cc',
+        '../components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc',
+        '../components/autofill/core/browser/address_field_unittest.cc',
+        '../components/autofill/core/browser/address_unittest.cc',
+        '../components/autofill/core/browser/android/auxiliary_profile_unittest_android.cc',
+        '../components/autofill/core/browser/autocomplete_history_manager_unittest.cc',
+        '../components/autofill/core/browser/autofill_country_unittest.cc',
+        '../components/autofill/core/browser/autofill_data_model_unittest.cc',
+        '../components/autofill/core/browser/autofill_download_unittest.cc',
+        '../components/autofill/core/browser/autofill_download_url_unittest.cc',
+        '../components/autofill/core/browser/autofill_external_delegate_unittest.cc',
+        '../components/autofill/core/browser/autofill_field_unittest.cc',
+        '../components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc',
+        '../components/autofill/core/browser/autofill_manager_unittest.cc',
+        '../components/autofill/core/browser/autofill_merge_unittest.cc',
+        '../components/autofill/core/browser/autofill_metrics_unittest.cc',
+        '../components/autofill/core/browser/autofill_profile_unittest.cc',
+        '../components/autofill/core/browser/autofill_regexes_unittest.cc',
+        '../components/autofill/core/browser/autofill_type_unittest.cc',
+        '../components/autofill/core/browser/autofill_xml_parser_unittest.cc',
+        '../components/autofill/core/browser/contact_info_unittest.cc',
+        '../components/autofill/core/browser/credit_card_field_unittest.cc',
+        '../components/autofill/core/browser/credit_card_unittest.cc',
+        '../components/autofill/core/browser/form_field_unittest.cc',
+        '../components/autofill/core/browser/form_structure_unittest.cc',
+        '../components/autofill/core/browser/name_field_unittest.cc',
+        '../components/autofill/core/browser/password_autofill_manager_unittest.cc',
+        '../components/autofill/core/browser/password_generator_unittest.cc',
+        '../components/autofill/core/browser/personal_data_manager_unittest.cc',
+        '../components/autofill/core/browser/phone_field_unittest.cc',
+        '../components/autofill/core/browser/phone_number_unittest.cc',
+        '../components/autofill/core/browser/phone_number_i18n_unittest.cc',
+        '../components/autofill/core/browser/validation_unittest.cc',
+
+        # TODO(caitkp): Move to //components/components_tests.gypi once
+        # remaining dependencies back to //chrome are eliminated.
+        '../components/autofill/core/browser/webdata/autofill_entry_unittest.cc',
+        '../components/autofill/core/browser/webdata/autofill_table_unittest.cc',
+        '../components/autofill/core/browser/webdata/web_data_service_unittest.cc',
+        '../components/autofill/core/common/password_form_fill_data_unittest.cc',
+
+        # TODO(yael): Move to //components/components_tests.gypi once
+        # nacl_defines is moved out of chrome.gyp into a common place.
+        '../components/nacl/loader/nacl_ipc_adapter_unittest.cc',
+        '../components/nacl/loader/nacl_validation_query_unittest.cc',
+
+        '../components/webdata/common/web_database_migration_unittest.cc',
+        '../components/webdata/common/web_data_service_test_util.cc',
+        '../components/webdata/common/web_data_service_test_util.h',
+        '../components/webdata/encryptor/ie7_password_unittest_win.cc',
+
+        # TODO(joi): Move the google_apis tests to a separate
+        # google_apis_unittests executable.
+        '../google_apis/google_api_keys_unittest.cc',
+        '../google_apis/cup/client_update_protocol_unittest.cc',
+        '../google_apis/gaia/mock_url_fetcher_factory.h',
+        '../google_apis/gaia/gaia_auth_fetcher_unittest.cc',
+        '../google_apis/gaia/gaia_auth_util_unittest.cc',
+        '../google_apis/gaia/gaia_oauth_client_unittest.cc',
+        '../google_apis/gaia/google_service_auth_error_unittest.cc',
+        '../google_apis/gaia/oauth_request_signer_unittest.cc',
+        '../google_apis/gaia/oauth2_access_token_fetcher_unittest.cc',
+        '../google_apis/gaia/oauth2_api_call_flow_unittest.cc',
+        '../google_apis/gaia/oauth2_mint_token_flow_unittest.cc',
+        '../skia/ext/analysis_canvas_unittest.cc',
+        '../skia/ext/bitmap_platform_device_mac_unittest.cc',
+        '../skia/ext/convolver_unittest.cc',
+        '../skia/ext/image_operations_unittest.cc',
+        '../skia/ext/lazy_pixel_ref_utils_unittest.cc',
+        '../skia/ext/platform_canvas_unittest.cc',
+        '../skia/ext/recursive_gaussian_convolution_unittest.cc',
+        '../skia/ext/refptr_unittest.cc',
+        '../skia/ext/skia_utils_ios_unittest.mm',
+        '../skia/ext/skia_utils_mac_unittest.mm',
+        '../skia/ext/vector_canvas_unittest.cc',
+        '../testing/gtest_mac_unittest.mm',
+        '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
+        '../third_party/zlib/google/zip_reader_unittest.cc',
+        '../third_party/zlib/google/zip_unittest.cc',
+        '../tools/json_schema_compiler/test/additional_properties_unittest.cc',
+        '../tools/json_schema_compiler/test/any_unittest.cc',
+        '../tools/json_schema_compiler/test/arrays_unittest.cc',
+        '../tools/json_schema_compiler/test/callbacks_unittest.cc',
+        '../tools/json_schema_compiler/test/choices_unittest.cc',
+        '../tools/json_schema_compiler/test/crossref_unittest.cc',
+        '../tools/json_schema_compiler/test/enums_unittest.cc',
+        '../tools/json_schema_compiler/test/functions_as_parameters_unittest.cc',
+        '../tools/json_schema_compiler/test/functions_on_types_unittest.cc',
+        '../tools/json_schema_compiler/test/idl_schemas_unittest.cc',
+        '../tools/json_schema_compiler/test/objects_unittest.cc',
+        '../tools/json_schema_compiler/test/simple_api_unittest.cc',
+        '../tools/json_schema_compiler/test/error_generation_unittest.cc',
+        '../ui/views/test/desktop_test_views_delegate.cc',
+        '../ui/views/test/desktop_test_views_delegate.h',
+        '../ui/views/test/test_views_delegate.cc',
+        '../ui/views/test/test_views_delegate.h',
+        '../ui/views/test/views_test_base.cc',
+        '../ui/views/test/views_test_base.h',
+        '../ui/webui/resources/js/cr.js',
+        '../webkit/browser/blob/mock_blob_url_request_context.cc',
+        '../webkit/browser/blob/mock_blob_url_request_context.h',
+        '../webkit/browser/quota/mock_storage_client.cc',
+        '../webkit/browser/quota/mock_storage_client.h',
+      ],
+      'conditions': [
+        ['OS!="ios"', {
+          'dependencies': [
+            'common/extensions/api/api.gyp:api',
+            '../components/components.gyp:autofill_content_test_support',
+            '../components/component_strings.gyp:component_strings',
+            '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
+            '../gpu/gpu.gyp:gpu_unittest_utils',
+            '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
+            '../third_party/cld/cld.gyp:cld',
+            '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+            '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+            '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests',
+            '../ui/gl/gl.gyp:gl',
+            '../v8/tools/gyp/v8.gyp:v8',
+            '../webkit/webkit_resources.gyp:webkit_resources',
+          ],
+          # TODO(scr): Use this in browser_tests too.
+          'includes': [
+            'js_unittest_rules.gypi',
+          ],
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome',
+          ],
+        }, {  # OS=="ios"
+          'dependencies': [
+            '../third_party/ocmock/ocmock.gyp:ocmock',
+          ],
+          'sources/': [
+            # Exclude everything but iOS-specific files.
+            ['exclude', '\\.(cc|mm)$'],
+            ['include', '_ios\\.(cc|mm)$'],
+            ['include', '(^|/)ios/'],
+            # TODO(ios): Add files here as they are updated to compile on iOS.
+            ['include', '^common/translate/language_detection_util_unittest\\.cc$'],
+            ['include', '^common/translate/translate_util_unittest\\.cc$'],
+            ['include', '^common/zip_'],
+          ],
+          'conditions': [
+            ['coverage != 0', {
+              'sources/': [
+                # These tests crash when run with coverage turned on due to an
+                # issue with llvm_gcda_increment_indirect_counter:
+                # http://crbug.com/156058
+                ['exclude', '^browser/autocomplete/bookmark_provider_unittest\\.cc$'],
+                ['exclude', '^browser/autocomplete/builtin_provider_unittest\\.cc$'],
+                ['exclude', '^browser/autocomplete/history_quick_provider_unittest\\.cc$'],
+                ['exclude', '^browser/autocomplete/shortcuts_provider_unittest\\.cc$'],
+                ['exclude', '^browser/bookmarks/bookmark_codec_unittest\\.cc$'],
+              ],
+            }],
+          ],
+          # Bundle all the necessary resources into the test bundle.
+          'includes': ['chrome_ios_bundle_resources.gypi'],
+          'xcode_settings': {'OTHER_LDFLAGS': ['-ObjC']},
+        }],
+        ['enable_background==0', {
+          'sources/': [
+            ['exclude', '^browser/background/'],
+          ],
+        }],
+        ['enable_spellcheck==0', {
+          'sources/': [
+             ['exclude', '^browser/spellchecker/'],
+             ['exclude', '^renderer/spellchecker/'],
+          ],
+          'dependencies!': [
+             '../third_party/hunspell/hunspell.gyp:hunspell',
+          ],
+        }],
+        ['enable_one_click_signin==0', {
+          'sources!': [
+            'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm',
+            'browser/ui/sync/one_click_signin_helper_unittest.cc',
+            'browser/ui/sync/one_click_signin_sync_starter_unittest.cc',
+            'browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc',
+          ]
+        }],
+        ['disable_nacl==1', {
+          'sources!':[
+            'browser/nacl_host/nacl_file_host_unittest.cc',
+            'browser/nacl_host/nacl_validation_cache_unittest.cc',
+            'browser/nacl_host/pnacl_host_unittest.cc',
+            'browser/nacl_host/pnacl_translation_cache_unittest.cc',
+            # TODO(yael): Move to //components/components_tests.gypi once
+            # nacl_defines is moved out of chrome.gyp into a common place.
+            '../components/nacl/loader/nacl_ipc_adapter_unittest.cc',
+            '../components/nacl/loader/nacl_validation_query_unittest.cc',
+          ],
+        }],
+        ['enable_extensions==0', {
+          'sources/': [
+            ['exclude', '^../extensions/'],
+            ['exclude', '^browser/extensions/activity_log/'],
+            ['exclude', '^browser/extensions/api/'],
+            ['exclude', '^browser/sync/glue/extensions_activity_monitor_unittest.cc'],
+            ['exclude', '^common/extensions/api/'],
+            ['exclude', '^common/extensions/manifest_handlers/'],
+            ['exclude', '^common/extensions/manifest_tests/'],
+          ],
+          'sources!': [
+            'browser/extensions/extension_context_menu_model_unittest.cc',
+            'browser/extensions/extension_protocols_unittest.cc',
+            'browser/extensions/extension_ui_unittest.cc',
+            'browser/extensions/pack_extension_unittest.cc',
+            'browser/extensions/permissions_updater_unittest.cc',
+            'browser/extensions/sandboxed_unpacker_unittest.cc',
+            'common/extensions/sync_type_unittest.cc',
+            'common/extensions/permissions/permission_set_unittest.cc',
+            'utility/extensions/unpacker_unittest.cc',
+          ],
+        }],
+        ['use_ash==1', {
+          'sources': [
+            'browser/ui/app_list/apps_model_builder_unittest.cc',
+            'browser/ui/app_list/search/app_search_provider_unittest.cc',
+            'browser/ui/app_list/search/history_unittest.cc',
+            'browser/ui/app_list/search/history_data_store_unittest.cc',
+            'browser/ui/app_list/search/mixer_unittest.cc',
+            'browser/ui/app_list/search/term_break_iterator_unittest.cc',
+            'browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc',
+            'browser/ui/app_list/search/tokenized_string_match_unittest.cc',
+            'browser/ui/app_list/search/tokenized_string_unittest.cc',
+          ],
+          'dependencies': [
+            '../ash/ash.gyp:ash_resources',
+            '../ash/ash.gyp:ash_test_support',
+            '../ash/ash_strings.gyp:ash_strings',
+          ],
+          # We eventually want to compile both in Win Aura builds, see
+          # http://crbug.com/155545.
+          'conditions': [
+            ['OS=="win"', {
+              'sources!': [
+                'browser/ui/window_sizer/window_sizer_ash_unittest.cc',
+              ],
+            }, { # else: OS!=win
+              'sources!': [
+                'browser/ui/window_sizer/window_sizer_unittest.cc',
+              ],
+            }],
+          ],
+        }],
+        ['use_aura==1', {
+          'dependencies': [
+            '../ui/aura/aura.gyp:aura_test_support',
+          ],
+          'sources/': [
+            ['exclude', '^browser/ui/views/extensions/browser_action_drag_data_unittest.cc'],
+            ['exclude', '^browser/ui/panels/display_settings_provider_win_unittest.cc'],
+            ['exclude', '^browser/bookmarks/bookmark_node_data_unittest.cc'],
+          ],
+        }],
+        ['enable_task_manager==0', {
+          'sources/': [
+            ['exclude', '^browser/task_manager/'],
+            ['exclude', '^browser/ui/webui/task_manager/'],
+          ],
+        }],
+        ['file_manager_extension==0', {
+          'sources!': [
+            'browser/ui/views/select_file_dialog_extension_unittest.cc',
+          ],
+        }],
+        ['enable_mdns == 1', {
+            'sources': [
+              'utility/local_discovery/local_domain_resolver_unittest.cc',
+              'utility/local_discovery/service_discovery_client_unittest.cc',
+              'browser/local_discovery/privet_device_lister_unittest.cc',
+            ]
+        }],
+        ['configuration_policy==0', {
+          'sources!': [
+            'browser/extensions/api/storage/policy_value_store_unittest.cc',
+            'browser/prefs/proxy_policy_unittest.cc',
+          ],
+          'sources/': [
+            ['exclude', '^browser/policy/'],
+          ],
+        }],
+        ['input_speech==0', {
+          'sources/': [
+            ['exclude', '^browser/speech/'],
+          ],
+        }],
+        ['notifications==0', {
+          'sources/': [
+            ['exclude', '^browser/notifications/'],
+          ],
+        }],
+        ['safe_browsing==1', {
+          'defines': [
+            'FULL_SAFE_BROWSING',
+          ],
+        }],
+        # TODO(sgurun): enable tests for safe_browsing==2.
+        ['safe_browsing!=1', {
+          'sources/': [
+            ['exclude', '^browser/safe_browsing/'],
+            ['exclude', '^renderer/safe_browsing/'],
+          ],
+        }],
+        ['enable_autofill_dialog!=1 or OS=="android"', {
+          'sources!': [
+            'browser/ui/autofill/account_chooser_model_unittest.cc',
+            'browser/ui/autofill/autocheckout_bubble_controller_unittest.cc',
+            'browser/ui/autofill/autofill_credit_card_bubble_controller_unittest.cc',
+            'browser/ui/autofill/autofill_dialog_controller_unittest.cc',
+            'browser/ui/autofill/mock_autofill_dialog_view_delegate.cc',
+            'browser/ui/autofill/mock_autofill_dialog_view_delegate.h',
+            'browser/ui/autofill/test_autofill_credit_card_bubble.cc',
+            'browser/ui/autofill/test_autofill_credit_card_bubble.h',
+          ],
+        }],
+        ['enable_automation!=1', {
+          'sources/': [
+            ['exclude', '^browser/automation/'],
+          ],
+        }],
+        ['enable_plugins==0', {
+          'sources/': [
+            ['exclude', '^browser/plugins/'],
+          ],
+          'sources!': [
+            'browser/renderer_host/plugin_info_message_filter_unittest.cc',
+          ],
+        }],
+        ['enable_printing!=1', {
+          'sources/': [
+            ['exclude', '^browser/printing/'],
+            ['exclude', '^browser/ui/webui/print_preview/'],
+          ],
+        }],
+        ['enable_captive_portal_detection!=1', {
+          'sources/': [
+            ['exclude', '^browser/captive_portal/'],
+          ],
+        }],
+        ['enable_session_service!=1', {
+          'sources!': [
+            'browser/sessions/session_service_unittest.cc',
+            'browser/ui/startup/session_crashed_infobar_delegate_unittest.cc',
+          ],
+        }],
+        ['enable_webrtc==0', {
+          'sources!': [
+            'browser/media/webrtc_log_uploader_unittest.cc',
+            'renderer/media/chrome_webrtc_log_message_delegate_unittest.cc',
+          ],
+        }],
+        ['chromeos==1', {
+          'sources!': [
+            'browser/password_manager/native_backend_gnome_x_unittest.cc',
+            'browser/password_manager/native_backend_kwallet_x_unittest.cc',
+            'browser/policy/cloud/mock_user_cloud_policy_store.cc',
+            'browser/policy/cloud/mock_user_cloud_policy_store.h',
+            'browser/policy/cloud/user_cloud_policy_manager_unittest.cc',
+            'browser/policy/cloud/user_cloud_policy_store_unittest.cc',
+            'browser/policy/cloud/user_policy_signin_service_unittest.cc',
+            'browser/safe_browsing/download_protection_service_unittest.cc',
+            'browser/signin/signin_manager_unittest.cc',
+            'browser/storage_monitor/storage_monitor_linux_unittest.cc',
+            'browser/ui/sync/one_click_signin_helper_unittest.cc',
+            'browser/ui/sync/one_click_signin_sync_starter_unittest.cc',
+          ],
+          'sources': [
+            'browser/ui/webui/feedback_ui_unittest.cc',
+          ],
+        }, { # else: chromeos == 0
+          'sources/': [
+            ['exclude', '^browser/chromeos/'],
+            ['exclude', '^browser/ui/webui/chromeos/imageburner/'],
+            ['exclude', '^browser/ui/webui/chromeos/login'],
+            ['exclude', '^browser/ui/webui/options/chromeos/'],
+            ['exclude', '^browser/ui/webui/options/chromeos/'],
+          ],
+          'sources!': [
+            'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc',
+            'browser/net/gaia/gaia_oauth_fetcher_unittest.cc',
+            'browser/extensions/api/log_private/syslog_parser_unittest.cc',
+          ],
+        }],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1', {
+          'conditions': [
+            ['toolkit_views==1', {
+              'sources!': [
+                'browser/ui/gtk/accelerators_gtk_unittest.cc',
+                'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
+                'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
+                'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
+                'browser/ui/gtk/gtk_theme_service_unittest.cc',
+                'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc',
+                'browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc',
+                'browser/ui/gtk/reload_button_gtk_unittest.cc',
+                'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
+              ],
+            }],
+            ['chromeos==0', {
+              'conditions': [
+                ['use_gnome_keyring==1', {
+                  # We use a few library functions directly, so link directly.
+                  'dependencies': [
+                    '../build/linux/system.gyp:gnome_keyring_direct',
+                  ],
+                }],
+              ],
+            }],
+          ],
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../build/linux/system.gyp:gtk',
+            '../dbus/dbus.gyp:dbus_test_support',
+            '../sandbox/sandbox.gyp:*',
+          ],
+          'sources!': [
+            'browser/printing/print_job_unittest.cc',
+          ],
+        }, { # else: toolkit_uses_gtk != 1
+          'sources!': [
+            'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
+            '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
+          ],
+        }],
+        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+          'dependencies': [
+            '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['use_gnome_keyring == 0', {
+          # Disable the GNOME Keyring tests if we are not using it.
+          'sources!': [
+            'browser/password_manager/native_backend_gnome_x_unittest.cc',
+          ],
+        }],
+        ['OS=="linux" and use_aura==1', {
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            '../dbus/dbus.gyp:dbus_test_support',
+            '../ui/aura/aura.gyp:aura_test_support',
+          ],
+        }],
+        ['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', {
+          'configurations': {
+            'Release': {
+              'ldflags': [
+                '-Wl,--strip-debug',
+              ],
+            },
+          },
+        }],
+        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+        ['OS=="mac"', {
+          # The test fetches resources which means Mac need the app bundle to
+          # exist on disk so it can pull from it.
+          'dependencies': [
+            'chrome',
+            '../third_party/ocmock/ocmock.gyp:ocmock',
+          ],
+          'include_dirs': [
+            '../third_party/GTM',
+            '../third_party/GTM/AppKit',
+          ],
+          'sources!': [
+            'browser/ui/tabs/dock_info_unittest.cc',
+            'browser/ui/tests/ui_gfx_image_unittest.cc',
+            'browser/ui/gtk/reload_button_gtk_unittest.cc',
+            'browser/password_manager/password_store_default_unittest.cc',
+            'tools/convert_dict/convert_dict_unittest.cc',
+            'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
+          ],
+          # TODO(mark): We really want this for all non-static library targets,
+          # but when we tried to pull it up to the common.gypi level, it broke
+          # other things like the ui, startup, and page_cycler tests. *shrug*
+          'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+        }],
+        ['OS!="mac" and OS!="ios"', {
+          'dependencies': [
+            'chrome_resources.gyp:packed_extra_resources',
+            'chrome_resources.gyp:packed_resources',
+            'convert_dict_lib',
+            '../third_party/hunspell/hunspell.gyp:hunspell',
+          ],
+        }],
+        ['OS!="win" and OS!="mac"', {
+          'sources!': [
+            '../skia/ext/platform_canvas_unittest.cc',
+          ],
+        }],
+        ['OS=="win" or OS=="mac"', {
+          'sources': [
+            'browser/media_galleries/fileapi/itunes_file_util_unittest.cc',
+            'browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc',
+            'utility/media_galleries/itunes_library_parser_unittest.cc',
+            'utility/media_galleries/picasa_album_table_reader_unittest.cc',
+            'utility/media_galleries/picasa_albums_indexer_unittest.cc',
+            'utility/media_galleries/pmp_column_reader_unittest.cc',
+          ],
+        }],
+        ['enable_rlz==0', {
+          'sources!': [
+            'browser/rlz/rlz_unittest.cc',
+          ],
+        }],
+        ['OS=="win" and component!="shared_library"', {
+          # Unit_tests pdb files can get too big when incremental linking is
+          # on, disabling for this target.
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_debug_link_nonincremental)',
+                },
+              },
+            },
+          },
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            'chrome_version_resources',
+            'installer_util_strings',
+            'unit_tests_exe_pdb_workaround',
+            '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+            '../third_party/isimpledom/isimpledom.gyp:isimpledom',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'sources': [
+            # TODO:  It would be nice to have these pulled in
+            # automatically from direct_dependent_settings in
+            # their various targets (net.gyp:net_resources, etc.),
+            # but that causes errors in other targets when
+            # resulting .res files get referenced multiple times.
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lcomsupp.lib',
+              '-loleacc.lib',
+              '-lrpcrt4.lib',
+              '-lurlmon.lib',
+              '-lwinmm.lib',
+            ],
+          },
+        }, { # else: OS != "win"
+          'sources!': [
+            'app/chrome_dll.rc',
+            'browser/bookmarks/bookmark_node_data_unittest.cc',
+            'browser/search_engines/template_url_scraper_unittest.cc',
+            'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
+            'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
+            'test/data/resource.rc',
+            '../skia/ext/vector_canvas_unittest.cc',
+          ],
+        }],
+        ['OS!="android" and OS!="ios"', {
+          'sources!': [
+            'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc',
+          ],
+        }],
+        ['OS=="android"', {
+          'sources!': [
+            # Bookmark export/import are handled via the BookmarkColumns
+            # ContentProvider.
+            'browser/bookmarks/bookmark_html_writer_unittest.cc',
+
+            'browser/shell_integration_unittest.cc',
+
+            # No service process (which also requires multiprocess lock).
+            'common/multi_process_lock_unittest.cc',
+
+            # Sync setup uses native ui.
+            'browser/ui/webui/sync_setup_handler_unittest.cc',
+
+            'browser/browser_commands_unittest.cc',
+            'browser/download/download_shelf_unittest.cc',
+            'browser/storage_monitor/media_storage_util_unittest.cc',
+            'browser/net/gaia/gaia_oauth_fetcher_unittest.cc',
+            'browser/page_cycler/page_cycler_unittest.cc',
+            'browser/policy/async_policy_provider_unittest.cc',
+            'browser/policy/cloud/cloud_external_data_manager_base_unittest.cc',
+            'browser/policy/cloud/cloud_external_data_store_unittest.cc',
+            'browser/policy/cloud/component_cloud_policy_service_unittest.cc',
+            'browser/policy/cloud/component_cloud_policy_store_unittest.cc',
+            'browser/policy/cloud/component_cloud_policy_updater_unittest.cc',
+            'browser/policy/cloud/external_policy_data_updater_unittest.cc',
+            'browser/policy/cloud/resource_cache_unittest.cc',
+            'browser/policy/config_dir_policy_loader_unittest.cc',
+            'browser/policy/managed_mode_policy_provider_unittest.cc',
+            'browser/policy/policy_path_parser_unittest.cc',
+            'browser/profiles/off_the_record_profile_impl_unittest.cc',
+            'browser/profiles/profile_loader_unittest.cc',
+            'browser/search/search_unittest.cc',
+            'browser/signin/profile_oauth2_token_service_unittest.cc',
+            'browser/sync/profile_sync_service_session_unittest.cc',
+            'browser/sync/sync_global_error_unittest.cc',
+            'browser/tab_contents/render_view_context_menu_unittest.cc',
+            'browser/ui/autofill/autofill_dialog_controller_unittest.cc',
+            'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc',
+            'browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc',
+            'browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc',
+            'browser/ui/bookmarks/bookmark_unittest.cc',
+            'browser/ui/browser_command_controller_unittest.cc',
+            'browser/ui/browser_iterator_unittest.cc',
+            'browser/ui/fullscreen/fullscreen_controller_state_unittest.cc',
+            'browser/ui/fullscreen/fullscreen_controller_unittest.cc',
+            'browser/ui/search/instant_ntp_prerenderer_unittest.cc',
+            'browser/ui/search/instant_page_unittest.cc',
+            'browser/ui/search/search_delegate_unittest.cc',
+            'browser/ui/search/search_model_unittest.cc',
+            'browser/ui/tab_contents/tab_contents_iterator_unittest.cc',
+            'browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc',
+            'browser/ui/toolbar/toolbar_model_unittest.cc',
+            'browser/ui/toolbar/wrench_menu_model_unittest.cc',
+            'browser/ui/webui/ntp/suggestions_combiner_unittest.cc',
+            'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc',
+            'browser/ui/window_sizer/window_sizer_common_unittest.cc',
+            'browser/ui/window_sizer/window_sizer_unittest.cc',
+            'test/base/browser_with_test_window_test.cc',
+            'test/base/browser_with_test_window_test.h',
+            'test/base/test_browser_window.h',
+
+            'browser/sessions/persistent_tab_restore_service_browsertest.cc',
+            'browser/sessions/session_backend_unittest.cc',
+
+            # Test files cannot be opened on Android.
+            'browser/drive/fake_drive_service_unittest.cc',
+            'browser/google_apis/base_requests_server_unittest.cc',
+            'browser/google_apis/drive_api_parser_unittest.cc',
+            'browser/google_apis/drive_api_requests_unittest.cc',
+            'browser/google_apis/gdata_wapi_parser_unittest.cc',
+            'browser/google_apis/gdata_wapi_requests_unittest.cc',
+            'browser/sync_file_system/drive_backend/api_util_unittest.cc',
+            'browser/sync_file_system/drive_backend/drive_file_sync_service_sync_unittest.cc',
+
+            'browser/user_style_sheet_watcher_unittest.cc',
+
+            # The autofill popup is implemented in mostly native code on
+            # Android.
+            'browser/ui/autofill/autofill_popup_controller_unittest.cc',
+
+            # Android uses a different invaliator.
+            'browser/invalidation/ticl_invalidation_service_unittest.cc',
+
+            # The importer code is not used on Android.
+            'common/importer/firefox_importer_utils_unittest.cc',
+
+            # USB service is not supported on Android.
+            'browser/usb/usb_context_unittest.cc',
+          ],
+          'sources/': [
+            ['exclude', '^browser/captive_portal/'],
+            ['exclude', '^browser/diagnostics/'],
+            ['exclude', '^browser/first_run/'],
+            ['exclude', '^browser/lifetime/'],
+            ['exclude', '^browser/media_galleries/'],
+            ['exclude', '^browser/net/firefox_*'],
+            ['exclude', '^browser/profile_resetter/'],
+            ['exclude', '^browser/speech/'],
+            ['exclude', '^browser/sync/glue/app_'],
+            ['exclude', '^browser/sync/glue/extension_'],
+            ['exclude', '^browser/themes/'],
+            ['exclude', '^browser/ui/autofill/.*credit_card_bubble.*'],
+            ['exclude', '^browser/ui/content_settings/'],
+            ['exclude', '^browser/ui/omnibox/'],
+            ['exclude', '^browser/ui/panels'],
+            ['exclude', '^browser/ui/tabs/'],
+            ['exclude', '^browser/ui/toolbar/'],
+            ['exclude', '^browser/ui/webui/downloads_'],
+            ['exclude', '^browser/ui/webui/feedback_'],
+            ['exclude', '^browser/ui/webui/flags_'],
+            ['exclude', '^browser/ui/webui/help/'],
+            ['exclude', '^browser/ui/webui/options/'],
+            ['exclude', '^browser/ui/webui/options/'],
+            ['exclude', '^browser/ui/webui/signin/'],
+            ['exclude', '^browser/ui/webui/suggestions_internals'],
+            ['exclude', '^browser/ui/webui/sync_promo'],
+            ['exclude', '^utility/importer/'],
+          ],
+          'conditions': [
+            ['gtest_target_type == "shared_library"', {
+              'dependencies': [
+                '../testing/android/native_test.gyp:native_test_native_code',
+                'chrome.gyp:chrome_android_auxiliary',
+              ],
+            }],
+          ],
+        }],  # OS == android
+        ['enable_printing!=1', {
+          'sources/': [
+            # No need for service process.
+            ['exclude', '^browser/service/'],
+            ['exclude', '^common/service_'],
+            ['exclude', '^service/'],
+          ],
+        }],
+        ['enable_themes==0', {
+          'sources!': [
+            'browser/ui/webui/theme_source_unittest.cc',
+          ],
+          'sources/': [
+            ['exclude', '^browser/themes/'],
+          ],
+        }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../ui/views/views.gyp:views',
+          ],
+          'sources!': [
+            'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
+          ],
+        }, { # else: toolkit_views == 0
+          'sources/': [
+            ['exclude', '^browser/ui/views/'],
+            ['exclude', '^../ui/views/'],
+          ],
+        }],
+        ['use_nss==0 and use_openssl==0', {
+          'sources!': [
+            'common/net/x509_certificate_model_unittest.cc',
+          ],
+        }],
+        ['use_openssl==1', {
+          'sources/': [
+            # OpenSSL build does not support firefox importer. See
+            # http://crbug.com/64926
+            ['exclude', '^browser/importer/'],
+          ],
+        }],
+        ['enable_managed_users!=1', {
+          'sources/': [
+            ['exclude', '^browser/managed_mode/'],
+          ],
+        }],
+        ['safe_browsing!=1', {
+          'sources/': [
+            ['exclude', '^browser/extensions/blacklist_unittest.cc'],
+          ],
+        }],
+      ],
+      'target_conditions': [
+        ['OS == "ios"', {
+          'sources/': [
+            ['include', '^common/mac/nscoder_util_unittest\\.mm$'],
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'chrome_app_unittests',
+      'type': 'executable',
+      'dependencies': [
+        # unit tests should only depend on
+        # 1) everything that the chrome binaries depend on:
+        '<@(chromium_browser_dependencies)',
+        '<@(chromium_child_dependencies)',
+        '../content/content.gyp:content_app_both',
+        # 2) test-specific support libraries:
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        'test_support_common',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'app/breakpad_field_trial_win.cc',
+        'app/breakpad_win.cc',
+        'app/breakpad_unittest_win.cc',
+        'app/delay_load_hook_win.cc',
+        'app/delay_load_hook_win.h',
+        'app/delay_load_hook_unittest_win.cc',
+        'app/hard_error_handler_win.cc',
+        'app/run_all_unittests.cc',
+        'common/crash_keys.cc',
+        'common/crash_keys.h',
+      ],
+      'conditions': [
+        ['OS=="mac" or OS=="ios"', {
+          'include_dirs': [
+            '<(DEPTH)/breakpad/src',
+          ],
+        }],
+        ['OS=="mac"', {
+          # TODO(mark): We really want this for all non-static library targets,
+          # but when we tried to pull it up to the common.gypi level, it broke
+          # other things like the ui, startup, and page_cycler tests. *shrug*
+          'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            # breakpad is currently only tested on Windows.
+            '../breakpad/breakpad.gyp:*',
+            '../components/components.gyp:breakpad_component',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+        }],
+      ],
+    },
+  ],
+
+  'conditions': [
+    # Special target to wrap a gtest_target_type==shared_library
+    # unit_tests into an android apk for execution.
+    ['OS == "android" and gtest_target_type == "shared_library"', {
+      'targets': [
+        {
+          'target_name': 'unit_tests_apk',
+          'type': 'none',
+          'dependencies': [
+            'chrome_java',
+            'unit_tests',
+          ],
+          'variables': {
+            'test_suite_name': 'unit_tests',
+            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_tests<(SHARED_LIB_SUFFIX)',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
+      ],
+    }],
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'unit_tests_run',
+          'type': 'none',
+          'dependencies': [
+            'unit_tests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+            'unit_tests.isolate',
+          ],
+          'sources': [
+            'unit_tests.isolate',
+          ],
+        },
+      ],
+    }],
+    ['OS=="win"', {
+      'targets' : [
+        {
+          # This target is only depended upon on Windows.
+          'target_name': 'unit_tests_exe_pdb_workaround',
+          'type': 'static_library',
+          'sources': [ 'empty_pdb_workaround.cc' ],
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              # This *in the compile phase* must match the pdb name that's
+              # output by the final link. See empty_pdb_workaround.cc for
+              # more details.
+              'DebugInformationFormat': '3',
+              'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
+            },
+          },
+        },
+      ],
+    }],
+  ],  # 'conditions'
+}
diff --git a/chromium/chrome/common/extensions/api/api.gyp b/chromium/chrome/common/extensions/api/api.gyp
new file mode 100644
index 00000000000..5c84ab1b881
--- /dev/null
+++ b/chromium/chrome/common/extensions/api/api.gyp
@@ -0,0 +1,135 @@
+# Copyright (c) 2012 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'api',
+      'type': 'static_library',
+      'sources': [
+        '<@(schema_files)',
+      ],
+      # TODO(jschuh): http://crbug.com/167187 size_t -> int
+      'msvs_disabled_warnings': [ 4267 ],
+      'includes': [
+        '../../../../build/json_schema_bundle_compile.gypi',
+        '../../../../build/json_schema_compile.gypi',
+      ],
+      'variables': {
+        'chromium_code': 1,
+        'schema_files': [
+          'alarms.idl',
+          'activity_log_private.json',
+          'adview.json',
+          'app_current_window_internal.idl',
+          'app_runtime.idl',
+          'app_window.idl',
+          'audio.idl',
+          'autotest_private.idl',
+          'bluetooth.idl',
+          'bookmark_manager_private.json',
+          'bookmarks.json',
+          'browsing_data.json',
+          'chromeos_info_private.json',
+          'cloud_print_private.json',
+          'command_line_private.json',
+          'content_settings.json',
+          'context_menus.json',
+          'cookies.json',
+          'debugger.json',
+          'developer_private.idl',
+          'desktop_capture.idl',
+          'diagnostics.idl',
+          'dial.idl',
+          'downloads.idl',
+          'echo_private.json',
+          'downloads_internal.idl',
+          'enterprise_platform_keys_private.json',
+          'events.json',
+          'experimental_accessibility.json',
+          'experimental_discovery.idl',
+          'experimental_dns.idl',
+          'experimental_history.json',
+          'experimental_identity.idl',
+          'experimental_idltest.idl',
+          'location.idl',
+          'system_memory.idl',
+          'extension.json',
+          'feedback_private.idl',
+          'file_browser_handler_internal.json',
+          'file_system.idl',
+          'font_settings.json',
+          'history.json',
+          'i18n.json',
+          'identity.idl',
+          'identity_private.idl',
+          'idle.json',
+          'infobars.json',
+          'input_ime.json',
+          'log_private.idl',
+          'management.json',
+          'manifest_types.json',
+          'media_galleries.idl',
+          'media_galleries_private.idl',
+          'media_player_private.json',
+          'metrics_private.json',
+          'music_manager_private.idl',
+          'networking_private.json',
+          'notifications.idl',
+          'omnibox.json',
+          'page_capture.json',
+          'permissions.json',
+          'preferences_private.json',
+          'power.idl',
+          'push_messaging.idl',
+          'recovery_private.idl',
+          'rtc_private.idl',
+          'runtime.json',
+          'serial.idl',
+          'session_restore.json',
+          'socket.idl',
+          'storage.json',
+          'sync_file_system.idl',
+          'system_indicator.idl',
+          'system_cpu.idl',
+          'system_display.idl',
+          'system_storage.idl',
+          'system_private.json',
+          'tab_capture.idl',
+          'tabs.json',
+          'terminal_private.json',
+          'test.json',
+          'top_sites.json',
+          'usb.idl',
+          'wallpaper_private.json',
+          'web_navigation.json',
+          'web_request.json',
+          'webstore_private.json',
+          'webview.json',
+          'windows.json',
+        ],
+        'cc_dir': 'chrome/common/extensions/api',
+        'root_namespace': 'extensions::api',
+      },
+      'dependencies': [
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/sync/sync.gyp:sync',
+      ],
+      'conditions': [
+        ['OS=="android"', {
+          'schema_files!': [
+            'usb.idl',
+          ],
+        }],
+        ['OS!="chromeos"', {
+          'schema_files!': [
+            'file_browser_handler_internal.json',
+            'log_private.idl',
+            'rtc_private.idl',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/common_constants.gyp b/chromium/chrome/common_constants.gyp
new file mode 100644
index 00000000000..3cb4843d33c
--- /dev/null
+++ b/chromium/chrome/common_constants.gyp
@@ -0,0 +1,119 @@
+# Copyright (c) 2012 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': {
+    'chromium_code': 1,
+  },
+
+  'includes': [
+    'version.gypi',
+  ],
+
+  'target_defaults': {
+    'sources': [
+      # TODO(yoz): Create an extension_constants target for these.
+      '../extensions/common/constants.cc',
+      '../extensions/common/constants.h',
+      'common/chrome_constants.cc',
+      'common/chrome_constants.h',
+      'common/chrome_paths.cc',
+      'common/chrome_paths.h',
+      'common/chrome_paths_android.cc',
+      'common/chrome_paths_internal.h',
+      'common/chrome_paths_linux.cc',
+      'common/chrome_paths_mac.mm',
+      'common/chrome_paths_win.cc',
+      'common/chrome_switches.cc',
+      'common/chrome_switches.h',
+      'common/env_vars.cc',
+      'common/env_vars.h',
+      'common/net/test_server_locations.cc',
+      'common/net/test_server_locations.h',
+      'common/pref_font_script_names-inl.h',
+      'common/pref_font_webkit_names.h',
+      'common/pref_names.cc',
+      'common/pref_names.h',
+      'common/widevine_cdm_constants.cc',
+      'common/widevine_cdm_constants.h',
+    ],
+    'actions': [
+      {
+        'action_name': 'Make chrome_version.cc',
+        'variables': {
+          'make_version_cc_path': 'tools/build/make_version_cc.py',
+        },
+        'inputs': [
+          '<(make_version_cc_path)',
+          'VERSION',
+        ],
+        'outputs': [
+          '<(INTERMEDIATE_DIR)/chrome_version.cc',
+        ],
+        'action': [
+          'python',
+          '<(make_version_cc_path)',
+          '<@(_outputs)',
+          '<(version_full)',
+        ],
+        'process_outputs_as_sources': 1,
+      },
+    ],
+  },
+  'targets': [
+    {
+      'target_name': 'common_constants',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
+      ],
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../components/nacl_common.gyp:nacl_switches',
+        '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+      ],
+      'target_conditions': [
+        ['OS=="ios"', {
+          # iOS needs chrome_paths_mac, which is excluded by filename rules;
+          # re-add it in target_conditionals so it's after that exclusion.
+          'sources/': [
+            ['include', '^common/chrome_paths_mac\\.mm$'],
+          ],
+        }],
+      ],
+      'conditions': [
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': ['../build/linux/system.gyp:gtk'],
+        }],
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
+          'target_name': 'common_constants_win64',
+          'type': 'static_library',
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
+          ],
+          'dependencies': [
+            '../base/base.gyp:base_nacl_win64',
+            '../components/nacl_common.gyp:nacl_switches_win64',
+            '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+          ],
+          'defines': [
+            '<@(nacl_win64_defines)',
+            'COMPILE_CONTENT_STATICALLY',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+        },
+      ],
+    }],
+  ],
+}
diff --git a/chromium/chrome/installer/installer_tools.gyp b/chromium/chrome/installer/installer_tools.gyp
new file mode 100644
index 00000000000..7af6c489db5
--- /dev/null
+++ b/chromium/chrome/installer/installer_tools.gyp
@@ -0,0 +1,47 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'version_py': '<(DEPTH)/chrome/tools/build/version.py',
+    'version_path': '<(DEPTH)/chrome/VERSION',
+    'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
+    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'msvs_use_common_release': 0,
+    'msvs_use_common_linker_extras': 0,
+  },
+  'conditions': [
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'validate_installation',
+          'type': 'executable',
+          'dependencies': [
+            '<(DEPTH)/base/base.gyp:base',
+            '<(DEPTH)/chrome/chrome.gyp:installer_util',
+            '<(DEPTH)/chrome/chrome.gyp:installer_util_strings',
+            '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+          ],
+          'include_dirs': [
+            '<(DEPTH)',
+          ],
+          'sources': [
+            'tools/validate_installation_main.cc',
+            'tools/validate_installation.rc',
+            'tools/validate_installation_resource.h',
+          ],
+        },
+      ],
+    }],
+    [ 'branding == "Chrome"', {
+      'variables': {
+         'branding_dir': '<(DEPTH)/chrome/app/theme/google_chrome',
+      },
+    }, { # else branding!="Chrome"
+      'variables': {
+         'branding_dir': '<(DEPTH)/chrome/app/theme/chromium',
+      },
+    }],
+  ],
+}
diff --git a/chromium/chrome/installer/mac/third_party/bsdiff/goobsdiff.gyp b/chromium/chrome/installer/mac/third_party/bsdiff/goobsdiff.gyp
new file mode 100644
index 00000000000..68e4668d0c0
--- /dev/null
+++ b/chromium/chrome/installer/mac/third_party/bsdiff/goobsdiff.gyp
@@ -0,0 +1,63 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'target_defaults': {
+    'include_dirs': [
+      '../../../../..',
+    ],
+    'link_settings': {
+      'libraries': [
+        '$(SDKROOT)/usr/lib/libbz2.dylib',
+        '$(SDKROOT)/usr/lib/libz.dylib',
+      ],
+    },
+    'configurations': {
+      'Release': {
+        'xcode_settings': {
+          # Use -Os to minimize the size of the installer tools.
+          'GCC_OPTIMIZATION_LEVEL': 's',
+        },
+      },
+    },
+  },
+  'targets': [
+    {
+      # Because size is a concern, don't link against all of base. Instead,
+      # just bring in a copy of the one component that's needed, along with
+      # the adapter that allows it to be called from C (not C++) code.
+      'target_name': 'goobsdiff_sha1_adapter',
+      'type': 'static_library',
+      'sources': [
+        '../../../../../base/sha1_portable.cc',
+        'sha1_adapter.cc',
+        'sha1_adapter.h',
+      ],
+    },
+    {
+      'target_name': 'goobsdiff',
+      'type': 'executable',
+      'dependencies': [
+        'goobsdiff_sha1_adapter',
+        '../xz/xz.gyp:lzma',
+      ],
+      'sources': [
+        'empty.cc',
+        'goobsdiff.c',
+      ],
+    },
+    {
+      'target_name': 'goobspatch',
+      'type': 'executable',
+      'dependencies': [
+        'goobsdiff_sha1_adapter',
+        '../xz/xz.gyp:lzma_decompress',
+      ],
+      'sources': [
+        'empty.cc',
+        'goobspatch.c',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/installer/mac/third_party/xz/xz.gyp b/chromium/chrome/installer/mac/third_party/xz/xz.gyp
new file mode 100644
index 00000000000..bbcea855f1e
--- /dev/null
+++ b/chromium/chrome/installer/mac/third_party/xz/xz.gyp
@@ -0,0 +1,415 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    # Configuration. Ordinarily, all of these features are enabled, and
+    # "small" is disabled. For Chromium's purposes, enable "small" and disable
+    # nearly everything else to save about 36kB in the lzma_decompress
+    # library, which will be distributed with updates. This also translates to
+    # a 25kB savings in the compressed disk image that will contain the
+    # update.
+    'check_crc32': 1,
+    'check_crc64': 0,
+    'check_sha256': 0,
+    'coder_lzma1': 0,
+    'coder_lzma2': 1,
+    'coder_delta': 0,
+    'coder_bcj_arm': 0,
+    'coder_bcj_armthumb': 0,
+    'coder_bcj_ia64': 0,
+    'coder_bcj_powerpc': 0,
+    'coder_bcj_sparc': 0,
+    'coder_bcj_x86': 1,
+    'small': 1,
+
+    'lzma_common_defines': [
+      'HAVE_CONFIG_H',
+    ],
+    'lzma_decompress_defines': [
+    ],
+    'lzma_compress_defines': [
+    ],
+
+    'lzma_include_dirs': [
+      'config/<(OS)',
+      'xz/src/common',
+      'xz/src/liblzma/api',
+      'xz/src/liblzma/check',
+      'xz/src/liblzma/common',
+      'xz/src/liblzma/delta',
+      'xz/src/liblzma/lz',
+      'xz/src/liblzma/lzma',
+      'xz/src/liblzma/rangecoder',
+      'xz/src/liblzma/simple',
+    ],
+
+    'lzma_common_source_files': [
+      'xz/src/common/tuklib_physmem.c',
+      'xz/src/liblzma/check/check.c',
+      'xz/src/liblzma/common/block_util.c',
+      'xz/src/liblzma/common/common.c',
+      'xz/src/liblzma/common/easy_preset.c',
+      'xz/src/liblzma/common/filter_common.c',
+      'xz/src/liblzma/common/hardware_physmem.c',
+      'xz/src/liblzma/common/index.c',
+      'xz/src/liblzma/common/stream_flags_common.c',
+      'xz/src/liblzma/common/vli_size.c',
+      'xz/src/liblzma/lzma/lzma_encoder_presets.c',
+      'xz/src/liblzma/rangecoder/price_table.c',
+    ],
+    'lzma_decompress_source_files': [
+      'xz/src/liblzma/common/alone_decoder.c',
+      'xz/src/liblzma/common/auto_decoder.c',
+      'xz/src/liblzma/common/block_buffer_decoder.c',
+      'xz/src/liblzma/common/block_decoder.c',
+      'xz/src/liblzma/common/block_header_decoder.c',
+      'xz/src/liblzma/common/easy_decoder_memusage.c',
+      'xz/src/liblzma/common/filter_buffer_decoder.c',
+      'xz/src/liblzma/common/filter_decoder.c',
+      'xz/src/liblzma/common/filter_flags_decoder.c',
+      'xz/src/liblzma/common/index_decoder.c',
+      'xz/src/liblzma/common/index_hash.c',
+      'xz/src/liblzma/common/stream_buffer_decoder.c',
+      'xz/src/liblzma/common/stream_decoder.c',
+      'xz/src/liblzma/common/stream_flags_decoder.c',
+      'xz/src/liblzma/common/vli_decoder.c',
+      'xz/src/liblzma/lz/lz_decoder.c',
+      'xz/src/liblzma/lzma/lzma_decoder.c',
+    ],
+    'lzma_compress_source_files': [
+      'xz/src/liblzma/common/alone_encoder.c',
+      'xz/src/liblzma/common/block_buffer_encoder.c',
+      'xz/src/liblzma/common/block_encoder.c',
+      'xz/src/liblzma/common/block_header_encoder.c',
+      'xz/src/liblzma/common/easy_buffer_encoder.c',
+      'xz/src/liblzma/common/easy_encoder.c',
+      'xz/src/liblzma/common/easy_encoder_memusage.c',
+      'xz/src/liblzma/common/filter_buffer_encoder.c',
+      'xz/src/liblzma/common/filter_encoder.c',
+      'xz/src/liblzma/common/filter_flags_encoder.c',
+      'xz/src/liblzma/common/index_encoder.c',
+      'xz/src/liblzma/common/stream_buffer_encoder.c',
+      'xz/src/liblzma/common/stream_encoder.c',
+      'xz/src/liblzma/common/stream_flags_encoder.c',
+      'xz/src/liblzma/common/vli_encoder.c',
+      'xz/src/liblzma/lz/lz_encoder.c',
+      'xz/src/liblzma/lz/lz_encoder_mf.c',
+      'xz/src/liblzma/lzma/lzma_encoder.c',
+      'xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c',
+      'xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c',
+    ],
+
+    'conditions': [
+      ['small != 0', {
+        'lzma_common_defines': [
+          'HAVE_SMALL=1',
+        ],
+        'lzma_common_source_files': [
+	  # CRC-32 must be compiled for header integrity checks, even if it is
+	  # not enabled for payload integrity checks.
+          'xz/src/liblzma/check/crc32_small.c',
+        ],
+      }, {
+        'lzma_common_source_files': [
+	  # CRC-32 must be compiled for header integrity checks, even if it is
+	  # not enabled for payload integrity checks.
+          #
+          # Use the "fast" implementation instead of the "x86" one for
+          # architecture independence. Both require the "table."
+          'xz/src/liblzma/check/crc32_fast.c',
+          'xz/src/liblzma/check/crc32_table.c',
+          # 'xz/src/liblzma/check/crc32_x86.S',
+        ],
+        'lzma_compress_source_files': [
+          'xz/src/liblzma/lzma/fastpos_table.c',
+        ],
+      }],
+      ['check_crc32 != 0', {
+        'lzma_common_defines': [
+          'HAVE_CHECK_CRC32=1',
+        ],
+      }],
+      ['check_crc64 != 0', {
+        'lzma_common_defines': [
+          'HAVE_CHECK_CRC64=1',
+        ],
+        'conditions': [
+          ['small != 0', {
+            'lzma_common_source_files': [
+              'xz/src/liblzma/check/crc64_small.c',
+            ],
+          }, {
+            'lzma_common_source_files': [
+              # Use the "fast" implementation instead of the "x86" one for
+              # architecture independence. Both require the "table."
+              'xz/src/liblzma/check/crc64_fast.c',
+              'xz/src/liblzma/check/crc64_table.c',
+              # 'xz/src/liblzma/check/crc64_x86.S',
+            ],
+          }],
+        ],
+      }],
+      ['check_sha256 != 0', {
+        'lzma_common_defines': [
+          'HAVE_CHECK_SHA256=1',
+        ],
+        'lzma_common_source_files': [
+          'xz/src/liblzma/check/sha256.c',
+        ],
+      }],
+      ['coder_lzma1 != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_LZMA1=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_LZMA1=1',
+        ],
+      }],
+      ['coder_lzma2 != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_LZMA2=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_LZMA2=1',
+        ],
+        'lzma_decompress_source_files': [
+          'xz/src/liblzma/lzma/lzma2_decoder.c',
+        ],
+        'lzma_compress_source_files': [
+          'xz/src/liblzma/lzma/lzma2_encoder.c',
+        ],
+      }],
+      ['coder_delta != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_DELTA=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_DELTA=1',
+        ],
+        'lzma_common_source_files': [
+          'xz/src/liblzma/delta/delta_common.c',
+        ],
+        'lzma_decompress_source_files': [
+          'xz/src/liblzma/delta/delta_decoder.c',
+        ],
+        'lzma_compress_source_files': [
+          'xz/src/liblzma/delta/delta_encoder.c',
+        ],
+      }],
+      ['coder_bcj_arm != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_ARM=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_ARM=1',
+        ],
+        'lzma_common_source_files': [
+          'xz/src/liblzma/simple/arm.c',
+        ],
+      }],
+      ['coder_bcj_armthumb != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_ARMTHUMB=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_ARMTHUMB=1',
+        ],
+        'lzma_common_source_files': [
+          'xz/src/liblzma/simple/armthumb.c',
+        ],
+      }],
+      ['coder_bcj_ia64 != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_IA64=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_IA64=1',
+        ],
+        'lzma_common_source_files': [
+          'xz/src/liblzma/simple/ia64.c',
+        ],
+      }],
+      ['coder_bcj_powerpc != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_POWERPC=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_POWERPC=1',
+        ],
+        'lzma_common_source_files': [
+          'xz/src/liblzma/simple/powerpc.c',
+        ],
+      }],
+      ['coder_bcj_sparc != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_SPARC=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_SPARC=1',
+        ],
+        'lzma_common_source_files': [
+          'xz/src/liblzma/simple/sparc.c',
+        ],
+      }],
+      ['coder_bcj_x86 != 0', {
+        'lzma_decompress_defines': [
+          'HAVE_DECODER_X86=1',
+        ],
+        'lzma_compress_defines': [
+          'HAVE_ENCODER_X86=1',
+        ],
+        'lzma_common_source_files': [
+          'xz/src/liblzma/simple/x86.c',
+        ],
+      }],
+      ['coder_bcj_arm != 0 or coder_bcj_armthumb != 0 or coder_bcj_ia64 != 0 or coder_bcj_powerpc != 0 or coder_bcj_sparc != 0 or coder_bcj_x86 != 0', {
+        'lzma_common_source_files': [
+          'xz/src/liblzma/simple/simple_coder.c',
+        ],
+        'lzma_decompress_source_files': [
+          'xz/src/liblzma/simple/simple_decoder.c',
+        ],
+        'lzma_compress_source_files': [
+          'xz/src/liblzma/simple/simple_encoder.c',
+        ],
+      }],
+    ],  # conditions
+  },  # variables
+
+  'targets': [
+    {
+      'target_name': 'lzma',
+      'type': 'static_library',
+      'defines': [
+        '<@(lzma_common_defines)',
+        '<@(lzma_decompress_defines)',
+        '<@(lzma_compress_defines)',
+      ],
+      'include_dirs': [
+        '<@(lzma_include_dirs)',
+      ],
+      'sources': [
+        '<@(lzma_common_source_files)',
+        '<@(lzma_decompress_source_files)',
+        '<@(lzma_compress_source_files)',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'xz/src/liblzma/api',
+        ],
+      },
+    },
+
+    {
+      'target_name': 'lzma_decompress',
+
+      # Always build as a shared library to promote code sharing. This library
+      # is distributed in Google Chrome update disk images and is used by more
+      # than one tool.
+      'type': 'shared_library',
+
+      'xcode_settings': {
+        # The library will reside in the same directory as executables linked
+        # against it.
+        'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+
+        # Trim the list of exported symbols to just those needed by
+        # dependents. This limits the set of "roots" seen during dead-code
+        # stripping and reduces the size of the library.
+        'EXPORTED_SYMBOLS_FILE': 'lzma_decompress.export',
+      },
+
+      'defines': [
+        '<@(lzma_common_defines)',
+        '<@(lzma_decompress_defines)',
+      ],
+      'include_dirs': [
+        '<@(lzma_include_dirs)',
+      ],
+      'sources': [
+        '<@(lzma_common_source_files)',
+        '<@(lzma_decompress_source_files)',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'xz/src/liblzma/api',
+        ],
+      },
+      'configurations': {
+        'Release': {
+          'xcode_settings': {
+            # Use -Os to minimize the size of the installer tools.
+            'GCC_OPTIMIZATION_LEVEL': 's',
+          },
+        },
+      },
+    },
+
+    {
+      'target_name': 'xz',
+      'type': 'executable',
+      'dependencies': [
+        'lzma',
+      ],
+      'defines': [
+        '<@(lzma_common_defines)',
+        '<@(lzma_decompress_defines)',
+        '<@(lzma_compress_defines)',
+      ],
+      'include_dirs': [
+        'config/<(OS)',
+        'xz/src/common',
+      ],
+      'sources': [
+        'xz/src/common/tuklib_cpucores.c',
+        'xz/src/common/tuklib_exit.c',
+        'xz/src/common/tuklib_mbstr_fw.c',
+        'xz/src/common/tuklib_mbstr_width.c',
+        'xz/src/common/tuklib_open_stdxxx.c',
+        'xz/src/common/tuklib_progname.c',
+        'xz/src/xz/args.c',
+        'xz/src/xz/coder.c',
+        'xz/src/xz/file_io.c',
+        'xz/src/xz/hardware.c',
+        'xz/src/xz/list.c',
+        'xz/src/xz/main.c',
+        'xz/src/xz/message.c',
+        'xz/src/xz/options.c',
+        'xz/src/xz/signals.c',
+        'xz/src/xz/suffix.c',
+        'xz/src/xz/util.c',
+      ],
+    },
+
+    {
+      'target_name': 'xzdec',
+      'type': 'executable',
+      'dependencies': [
+        'lzma_decompress',
+      ],
+      'defines': [
+        '<@(lzma_common_defines)',
+        '<@(lzma_decompress_defines)',
+      ],
+      'include_dirs': [
+        'config/<(OS)',
+        'xz/src/common',
+      ],
+      'sources': [
+        'xz/src/common/tuklib_exit.c',
+        'xz/src/common/tuklib_progname.c',
+        'xz/src/xzdec/xzdec.c',
+      ],
+      'configurations': {
+        'Release': {
+          'xcode_settings': {
+            # Use -Os to minimize the size of the installer tools.
+            'GCC_OPTIMIZATION_LEVEL': 's',
+          },
+        },
+      },
+    },
+  ],
+}
diff --git a/chromium/chrome/installer/mini_installer.gyp b/chromium/chrome/installer/mini_installer.gyp
new file mode 100644
index 00000000000..05d54d2875c
--- /dev/null
+++ b/chromium/chrome/installer/mini_installer.gyp
@@ -0,0 +1,302 @@
+{
+  'variables': {
+    'version_py': '../../chrome/tools/build/version.py',
+    'version_path': '../../chrome/VERSION',
+    'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
+    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'msvs_use_common_release': 0,
+    'msvs_use_common_linker_extras': 0,
+    'mini_installer_internal_deps%': 0,
+    'mini_installer_official_deps%': 0,
+  },
+  'includes': [
+    '../../build/win_precompile.gypi',
+  ],
+  'conditions': [
+    ['OS=="win"', {
+      'target_defaults': {
+        'dependencies': [
+          '../chrome.gyp:app_host',
+          '../chrome.gyp:chrome',
+          '../chrome.gyp:chrome_nacl_win64',
+          '../chrome.gyp:chrome_dll',
+          '../chrome.gyp:default_extensions',
+          '../chrome.gyp:setup',
+        ],
+        'include_dirs': [
+          '../..',
+          '<(INTERMEDIATE_DIR)',
+          '<(SHARED_INTERMEDIATE_DIR)/chrome',
+        ],
+        'sources': [
+          'mini_installer/appid.h',
+          'mini_installer/configuration.cc',
+          'mini_installer/configuration.h',
+          'mini_installer/decompress.cc',
+          'mini_installer/decompress.h',
+          'mini_installer/mini_installer.cc',
+          'mini_installer/mini_installer.h',
+          'mini_installer/mini_installer.ico',
+          'mini_installer/mini_installer.rc',
+          'mini_installer/mini_installer_exe_version.rc.version',
+          'mini_installer/mini_installer_resource.h',
+          'mini_installer/mini_string.cc',
+          'mini_installer/mini_string.h',
+          'mini_installer/pe_resource.cc',
+          'mini_installer/pe_resource.h',
+          '<(INTERMEDIATE_DIR)/packed_files.rc',
+        ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'EnableIntrinsicFunctions': 'true',
+            'BufferSecurityCheck': 'false',
+            'BasicRuntimeChecks': '0',
+            'ExceptionHandling': '0',
+          },
+          'VCLinkerTool': {
+            'RandomizedBaseAddress': '1',
+            'DataExecutionPrevention': '0',
+            'AdditionalLibraryDirectories': [
+              '<(PRODUCT_DIR)/lib'
+            ],
+            'DelayLoadDLLs': [],
+            'EntryPointSymbol': 'MainEntryPoint',
+            'GenerateMapFile': 'true',
+            'IgnoreAllDefaultLibraries': 'true',
+            'OptimizeForWindows98': '1',
+            'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
+            'AdditionalDependencies': [
+              'shlwapi.lib',
+              'setupapi.lib',
+            ],
+          },
+          'VCManifestTool': {
+            'AdditionalManifestFiles': [
+              '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
+            ],
+          },
+        },
+        'configurations': {
+          'Debug_Base': {
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'BasicRuntimeChecks': '0',
+                'BufferSecurityCheck': 'false',
+                'ExceptionHandling': '0',
+              },
+              'VCLinkerTool': {
+                'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
+                'AdditionalOptions': [
+                  '/safeseh:no',
+                  '/dynamicbase:no',
+                  '/ignore:4199',
+                  '/ignore:4221',
+                  '/nxcompat',
+                ],
+              },
+            },
+          },
+          'Release_Base': {
+            'includes': ['../../build/internal/release_defaults.gypi'],
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'EnableIntrinsicFunctions': 'true',
+                'BasicRuntimeChecks': '0',
+                'BufferSecurityCheck': 'false',
+                'ExceptionHandling': '0',
+              },
+              'VCLinkerTool': {
+                'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
+                'Profile': 'false',   # Conflicts with /FIXED
+                'AdditionalOptions': [
+                  '/SAFESEH:NO',
+                  '/NXCOMPAT',
+                  '/DYNAMICBASE:NO',
+                  '/FIXED',
+                ],
+              },
+            },
+          },
+        },
+        'rules': [
+          {
+            'rule_name': 'mini_installer_version',
+            'extension': 'version',
+            'variables': {
+              'template_input_path': 'mini_installer/mini_installer_exe_version.rc.version',
+            },
+            'inputs': [
+              '<(template_input_path)',
+              '<(version_path)',
+              '<(lastchange_path)',
+              '<(branding_dir)/BRANDING',
+            ],
+            'outputs': [
+              '<(PRODUCT_DIR)/mini_installer_exe_version.rc',
+            ],
+            'action': [
+              'python', '<(version_py)',
+              '-f', '<(version_path)',
+              '-f', '<(lastchange_path)',
+              '-f', '<(branding_dir)/BRANDING',
+              '<(template_input_path)',
+              '<@(_outputs)',
+            ],
+            'process_outputs_as_sources': 1,
+            'message': 'Generating version information'
+          },
+        ],
+        # TODO(mark):  <(branding_dir) should be defined by the
+        # global condition block at the bottom of the file, but
+        # this doesn't work due to the following issue:
+        #
+        #   http://code.google.com/p/gyp/issues/detail?id=22
+        #
+        # Remove this block once the above issue is fixed.
+        'conditions': [
+          [ 'branding == "Chrome"', {
+            'variables': {
+               'branding_dir': '../app/theme/google_chrome',
+            },
+          }, { # else branding!="Chrome"
+            'variables': {
+               'branding_dir': '../app/theme/chromium',
+            },
+          }],
+        ],
+      },
+      'targets': [
+        {
+          'target_name': 'mini_installer',
+          'type': 'executable',
+
+          # Disable precompiled headers for this project, to avoid
+          # linker errors when building with VS 2008.
+          'msvs_precompiled_header': '',
+          'msvs_precompiled_source': '',
+
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+          
+          'sources': [
+            'mini_installer/chrome.release',
+            'mini_installer/chrome_appid.cc',
+          ],
+          'rules': [
+            {
+              'rule_name': 'installer_archive',
+              'extension': 'release',
+              'variables': {
+                'create_installer_archive_py_path':
+                  '../tools/build/win/create_installer_archive.py',
+              },
+              'conditions': [
+                ['enable_hidpi == 1', {
+                  'variables': {
+                    'enable_hidpi_flag': '--enable_hidpi=1',
+                  },
+                }, {
+                  'variables': {
+                    'enable_hidpi_flag': '',
+                  },
+                }],
+                ['enable_touch_ui == 1', {
+                  'variables': {
+                    'enable_touch_ui_flag': '--enable_touch_ui=1',
+                  },
+                }, {
+                  'variables': {
+                    'enable_touch_ui_flag': '',
+                  },
+                }],
+                ['component == "shared_library"', {
+                  'variables': {
+                    'component_build_flag': '--component_build=1',
+                  },
+                }, {
+                  'variables': {
+                    'component_build_flag': '',
+                  },
+                  'outputs': [
+                    '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
+                  ],
+                }],
+                ['disable_nacl==1', {
+                  'inputs!': [
+                    '<(PRODUCT_DIR)/nacl64.exe',
+                    '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
+                    '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+                    '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+                  ],
+                }],
+                ['target_arch=="x64"', {
+                  'inputs!': [
+                    '<(PRODUCT_DIR)/nacl64.exe',
+                    '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+                  ],
+                  'variables': {
+                    'target_arch_flag': '--target_arch=x64',
+                  },
+                }, {
+                  'variables': {
+                    'target_arch_flag': '--target_arch=x86',
+                  },
+                }],
+              ],
+              'inputs': [
+                '<(create_installer_archive_py_path)',
+                '<(PRODUCT_DIR)/app_host.exe',
+                '<(PRODUCT_DIR)/chrome.exe',
+                '<(PRODUCT_DIR)/chrome.dll',
+                '<(PRODUCT_DIR)/nacl64.exe',
+                '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
+                '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+                '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+                '<(PRODUCT_DIR)/locales/en-US.pak',
+                '<(PRODUCT_DIR)/icudt.dll',
+              ],
+              'outputs': [
+                # Also note that chrome.packed.7z is defined as an output in a
+                # conditional above.
+                'xxx2.out',
+                '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
+                '<(PRODUCT_DIR)/setup.ex_',
+                '<(INTERMEDIATE_DIR)/packed_files.rc',
+              ],
+              'action': [
+                'python',
+                '<(create_installer_archive_py_path)',
+                '--build_dir', '<(PRODUCT_DIR)',
+                '--staging_dir', '<(INTERMEDIATE_DIR)',
+                '--input_file', '<(RULE_INPUT_PATH)',
+                '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
+                '<(enable_hidpi_flag)',
+                '<(enable_touch_ui_flag)',
+                '<(component_build_flag)',
+                '<(target_arch_flag)',
+                # TODO(sgk):  may just use environment variables
+                #'--distribution=$(CHROMIUM_BUILD)',
+                '--distribution=_google_chrome',
+                # Optional arguments to generate diff installer
+                #'--last_chrome_installer=C:/Temp/base',
+                #'--setup_exe_format=DIFF',
+                #'--diff_algorithm=COURGETTE',
+              ],
+              'message': 'Create installer archive',
+              'msvs_cygwin_shell': 1,
+            },
+          ],
+        },
+      ],
+    }],
+    [ 'branding == "Chrome"', {
+      'variables': {
+         'branding_dir': '../app/theme/google_chrome',
+      },
+    }, { # else branding!="Chrome"
+      'variables': {
+         'branding_dir': '../app/theme/chromium',
+      },
+    }],
+  ],
+}
diff --git a/chromium/chrome/installer/mini_installer.gypi b/chromium/chrome/installer/mini_installer.gypi
new file mode 100644
index 00000000000..ee9403cab19
--- /dev/null
+++ b/chromium/chrome/installer/mini_installer.gypi
@@ -0,0 +1,251 @@
+# Copyright (c) 2012 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.
+{
+  'dependencies': [
+    '<@(chrome_dll_project)',
+    '../chrome.gyp:app_host',
+    '../chrome.gyp:chrome',
+    '../chrome.gyp:chrome_nacl_win64',
+    '../chrome.gyp:default_extensions',
+    '../chrome.gyp:setup',
+  ],
+  'include_dirs': [
+    '../..',
+    '<(INTERMEDIATE_DIR)',
+    '<(SHARED_INTERMEDIATE_DIR)/chrome',
+  ],
+  'sources': [
+    'mini_installer/appid.h',
+    'mini_installer/chrome.release',
+    'mini_installer/chrome_appid.cc',
+    'mini_installer/configuration.cc',
+    'mini_installer/configuration.h',
+    'mini_installer/decompress.cc',
+    'mini_installer/decompress.h',
+    'mini_installer/mini_installer.cc',
+    'mini_installer/mini_installer.h',
+    'mini_installer/mini_installer.ico',
+    'mini_installer/mini_installer.rc',
+    'mini_installer/mini_installer_exe_version.rc.version',
+    'mini_installer/mini_installer_resource.h',
+    'mini_installer/mini_string.cc',
+    'mini_installer/mini_string.h',
+    'mini_installer/pe_resource.cc',
+    'mini_installer/pe_resource.h',
+    '<(INTERMEDIATE_DIR)/packed_files.rc',
+  ],
+  # Disable precompiled headers for this project, to avoid
+  # linker errors when building with VS 2008.
+  'msvs_precompiled_header': '',
+  'msvs_precompiled_source': '',
+  'msvs_settings': {
+    'VCCLCompilerTool': {
+      'EnableIntrinsicFunctions': 'true',
+      'BufferSecurityCheck': 'false',
+      'BasicRuntimeChecks': '0',
+      'ExceptionHandling': '0',
+    },
+    'VCLinkerTool': {
+      'OutputFile': '<(output_dir)/mini_installer.exe',
+      'MapFileName': '<(output_dir)/mini_installer.map',
+      'RandomizedBaseAddress': '1',
+      'DataExecutionPrevention': '0',
+      'AdditionalLibraryDirectories': [
+        '<(PRODUCT_DIR)/lib'
+      ],
+      'DelayLoadDLLs': [],
+      'EntryPointSymbol': 'MainEntryPoint',
+      'GenerateMapFile': 'true',
+      'IgnoreAllDefaultLibraries': 'true',
+      'OptimizeForWindows98': '1',
+      'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
+      'AdditionalDependencies': [
+        'shlwapi.lib',
+        'setupapi.lib',
+      ],
+      'conditions': [
+        ['MSVS_VERSION=="2005e"', {
+          'AdditionalDependencies': [  # Must explicitly link in VC2005E
+            'advapi32.lib',
+            'shell32.lib',
+          ],
+        }],
+      ],
+    },
+    'VCManifestTool': {
+      'AdditionalManifestFiles': [
+        '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
+      ],
+    },
+  },
+  'configurations': {
+    'Debug_Base': {
+      'msvs_settings': {
+        'VCCLCompilerTool': {
+          'BasicRuntimeChecks': '0',
+          'BufferSecurityCheck': 'false',
+          'ExceptionHandling': '0',
+        },
+        'VCLinkerTool': {
+          'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
+          'AdditionalOptions': [
+            '/safeseh:no',
+            '/dynamicbase:no',
+            '/ignore:4199',
+            '/ignore:4221',
+            '/nxcompat',
+          ],
+        },
+      },
+    },
+    'Release_Base': {
+      'includes': ['../../build/internal/release_defaults.gypi'],
+      'msvs_settings': {
+        'VCCLCompilerTool': {
+          'EnableIntrinsicFunctions': 'true',
+          'BasicRuntimeChecks': '0',
+          'BufferSecurityCheck': 'false',
+          'ExceptionHandling': '0',
+        },
+        'VCLinkerTool': {
+          'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
+          'Profile': 'false',  # Conflicts with /FIXED
+          'AdditionalOptions': [
+            '/SAFESEH:NO',
+            '/NXCOMPAT',
+            '/DYNAMICBASE:NO',
+            '/FIXED',
+          ],
+        },
+      },
+    },
+  },
+  'rules': [
+    {
+      'rule_name': 'mini_installer_version',
+      'extension': 'version',
+      'variables': {
+        'template_input_path':
+            'mini_installer/mini_installer_exe_version.rc.version',
+      },
+      'inputs': [
+        '<(template_input_path)',
+        '<(version_path)',
+        '<(lastchange_path)',
+        '<(branding_dir)/BRANDING',
+      ],
+      'outputs': [
+        '<(INTERMEDIATE_DIR)/mini_installer_exe_version.rc',
+      ],
+      'action': [
+        'python', '<(version_py)',
+        '-f', '<(version_path)',
+        '-f', '<(lastchange_path)',
+        '-f', '<(branding_dir)/BRANDING',
+        '<(template_input_path)',
+        '<@(_outputs)',
+      ],
+      'process_outputs_as_sources': 1,
+      'message': 'Generating version information'
+    },
+    {
+      'rule_name': 'installer_archive',
+      'extension': 'release',
+      'variables': {
+        'create_installer_archive_py_path':
+          '../tools/build/win/create_installer_archive.py',
+      },
+      'conditions': [
+        ['enable_hidpi == 1', {
+          'variables': {
+            'enable_hidpi_flag': '--enable_hidpi=1',
+          },
+        }, {
+          'variables': {
+            'enable_hidpi_flag': '',
+          },
+        }],
+        ['enable_touch_ui == 1', {
+          'variables': {
+            'enable_touch_ui_flag': '--enable_touch_ui=1',
+          },
+        }, {
+          'variables': {
+            'enable_touch_ui_flag': '',
+          },
+        }],
+        ['target_arch=="x64"', {
+          'inputs!': [
+            '<(PRODUCT_DIR)/nacl64.exe',
+            '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+          ],
+          'variables': {
+            'target_arch_flag': '--target_arch=x64',
+          },
+        }, {
+          'variables': {
+            'target_arch_flag': '--target_arch=x86',
+          },
+        }],
+      ],
+      'inputs': [
+        '<(create_installer_archive_py_path)',
+        '<(PRODUCT_DIR)/app_host.exe',
+        '<(PRODUCT_DIR)/chrome.exe',
+        '<@(chrome_dll_path)',
+        '<(PRODUCT_DIR)/nacl64.exe',
+        '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
+        '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+        '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+        '<(PRODUCT_DIR)/locales/en-US.pak',
+        '<(PRODUCT_DIR)/icudt.dll',
+      ],
+      'outputs': [
+        'xxx.out',
+        '<(output_dir)/<(RULE_INPUT_NAME).7z',
+        '<(output_dir)/<(RULE_INPUT_NAME).packed.7z',
+        '<(output_dir)/setup.ex_',
+        '<(INTERMEDIATE_DIR)/packed_files.rc',
+      ],
+      'action': [
+        'python',
+        '<(create_installer_archive_py_path)',
+        '--build_dir=<(PRODUCT_DIR)',
+        '--output_dir=<(output_dir)',
+        '--staging_dir=<(INTERMEDIATE_DIR)',
+        '--input_file=<(RULE_INPUT_PATH)',
+        '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
+        '<(enable_hidpi_flag)',
+        '<(enable_touch_ui_flag)',
+        '<(target_arch_flag)',
+        # TODO(sgk):  may just use environment variables
+        #'--distribution=$(CHROMIUM_BUILD)',
+        '--distribution=_google_chrome',
+        # Optional arguments to generate diff installer
+        #'--last_chrome_installer=C:/Temp/base',
+        #'--setup_exe_format=DIFF',
+        #'--diff_algorithm=COURGETTE',
+      ],
+      'message': 'Create installer archive'
+    },
+  ],
+  # TODO(mark):  <(branding_dir) should be defined by the
+  # global condition block at the bottom of the file, but
+  # this doesn't work due to the following issue:
+  #
+  #   http://code.google.com/p/gyp/issues/detail?id=22
+  #
+  # Remove this block once the above issue is fixed.
+  'conditions': [
+    [ 'branding == "Chrome"', {
+      'variables': {
+         'branding_dir': '../app/theme/google_chrome',
+      },
+    }, { # else branding!="Chrome"
+      'variables': {
+         'branding_dir': '../app/theme/chromium',
+      },
+    }],
+  ],
+}
diff --git a/chromium/chrome/installer/mini_installer_syzygy.gyp b/chromium/chrome/installer/mini_installer_syzygy.gyp
new file mode 100644
index 00000000000..6c9934720b7
--- /dev/null
+++ b/chromium/chrome/installer/mini_installer_syzygy.gyp
@@ -0,0 +1,77 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'variables': {
+    'version_py': '<(DEPTH)/chrome/tools/build/version.py',
+    'version_path': '<(DEPTH)/chrome/VERSION',
+    'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
+    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'msvs_use_common_release': 0,
+    'msvs_use_common_linker_extras': 0,
+  },
+  'includes': [
+    '../../build/win_precompile.gypi',
+  ],
+  'conditions': [
+    # This target won't build in fastbuild, since there are no PDBs. 
+    ['OS=="win" and fastbuild==0', {
+      'conditions': [
+        ['chrome_multiple_dll==0', {
+          'targets': [
+            {
+              'target_name': 'mini_installer_syzygy',
+              'type': 'executable',
+              'product_name': 'mini_installer',
+
+              'variables': {
+                'chrome_dll_project': [
+                  '../chrome_syzygy.gyp:chrome_dll_syzygy',
+                ],
+                'chrome_dll_path': [
+                  '<(PRODUCT_DIR)/syzygy/chrome.dll',
+                ],
+                'output_dir': '<(PRODUCT_DIR)/syzygy',
+              },
+              # Bulk of the build configuration comes from here.
+              'includes': [ 'mini_installer.gypi', ],
+            },
+          ],
+        }, {
+          'targets': [
+            {
+              'target_name': 'mini_installer_syzygy',
+              'type': 'executable',
+              'product_name': 'mini_installer',
+
+              'variables': {
+                'chrome_dll_project': [
+                  '../chrome_syzygy.gyp:chrome_dll_syzygy',
+                  '../chrome_syzygy.gyp:chrome_child_dll_syzygy',
+                ],
+                'chrome_dll_path': [
+                  '<(PRODUCT_DIR)/syzygy/chrome.dll',
+                  '<(PRODUCT_DIR)/syzygy/chrome_child.dll',
+                ],
+                'output_dir': '<(PRODUCT_DIR)/syzygy',
+              },
+              # Bulk of the build configuration comes from here.
+              'includes': [ 'mini_installer.gypi', ],
+            },
+          ],
+        }],
+      ],
+    },{
+      'targets': [],
+    }],
+    [ 'branding == "Chrome"', {
+      'variables': {
+         'branding_dir': '../app/theme/google_chrome',
+      },
+    }, {  # else branding!="Chrome"
+      'variables': {
+         'branding_dir': '../app/theme/chromium',
+      },
+    }],
+  ],
+}
diff --git a/chromium/chrome/installer/upgrade_test.gyp b/chromium/chrome/installer/upgrade_test.gyp
new file mode 100644
index 00000000000..82c60da69ba
--- /dev/null
+++ b/chromium/chrome/installer/upgrade_test.gyp
@@ -0,0 +1,100 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'version_py': '../../chrome/tools/build/version.py',
+    'version_path': '../../chrome/VERSION',
+    'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
+    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'msvs_use_common_release': 0,
+    'msvs_use_common_linker_extras': 0,
+  },
+  'includes': [
+    '../../build/win_precompile.gypi',
+  ],
+  'conditions': [
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'alternate_version_generator_lib',
+          'type': 'static_library',
+          'dependencies': [
+            '../chrome.gyp:installer_util',
+            '../common_constants.gyp:common_constants',
+            '../../base/base.gyp:base',
+          ],
+          'include_dirs': [
+            '../..',
+          ],
+          'sources': [
+            'test/alternate_version_generator.cc',
+            'test/alternate_version_generator.h',
+            'test/pe_image_resources.cc',
+            'test/pe_image_resources.h',
+            'test/resource_loader.cc',
+            'test/resource_loader.h',
+            'test/resource_updater.cc',
+            'test/resource_updater.h',
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [4267, ],
+        },
+        {
+          'target_name': 'upgrade_test',
+          'type': 'executable',
+          'dependencies': [
+            'alternate_version_generator_lib',
+            # This dependency, although correct, results in the mini installer
+            # being rebuilt every time upgrade_test is built.  So disable it
+            # for now.
+            # TODO(grt): fix rules/targets/etc for
+            # mini_installer.gyp:mini_installer so that it does no work if
+            # nothing has changed, then un-comment this next line:
+            # 'mini_installer.gyp:mini_installer',
+            '../../base/base.gyp:test_support_base',
+            '../../testing/gtest.gyp:gtest',
+            '../chrome.gyp:installer_util',
+            '../common_constants.gyp:common_constants',
+          ],
+          'include_dirs': [
+            '../..',
+          ],
+          'sources': [
+            'test/run_all_tests.cc',
+            'test/upgrade_test.cc',
+          ],
+        },
+        {
+          'target_name': 'alternate_version_generator',
+          'type': 'executable',
+          'dependencies': [
+            'alternate_version_generator_lib',
+            '../../base/base.gyp:test_support_base',
+            '../../testing/gtest.gyp:gtest',
+            '../chrome.gyp:installer_util',
+            '../common_constants.gyp:common_constants',
+          ],
+          'include_dirs': [
+            '../..',
+          ],
+          'sources': [
+            'test/alternate_version_generator_main.cc',
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        },
+      ],
+    }],
+    [ 'branding == "Chrome"', {
+      'variables': {
+         'branding_dir': '../app/theme/google_chrome',
+      },
+    }, { # else branding!="Chrome"
+      'variables': {
+         'branding_dir': '../app/theme/chromium',
+      },
+    }],
+  ],
+}
diff --git a/chromium/chrome/js_unittest_rules.gypi b/chromium/chrome/js_unittest_rules.gypi
new file mode 100644
index 00000000000..a75494f22dc
--- /dev/null
+++ b/chromium/chrome/js_unittest_rules.gypi
@@ -0,0 +1,82 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file defines rules that allow you to include JavaScript tests in
+# your unittests target.
+
+# To add JS unittests to an existing unittest target, first include
+# 'js_unittest_vars.gypi' at the top of your GYP file to define the required
+# variables:
+#
+#  'includes': [
+#    '<(DEPTH)/chrome/js_unittest_vars.gypi',
+#  ],
+#
+# Then include this rule file in each of your unittest targets:
+#
+#    {
+#      'target_name': 'my_unittests',
+#      ...
+#      'includes': [
+#        '<(DEPTH)/chrome/js_unittest_rules.gypi',
+#      ],
+#    }
+#
+# Note that when you run your TestSuite, you'll need to call
+# chrome::RegisterPathProvider(). These path providers are required by
+# src/chrome/test/base/v8_unit_test.cc to setup and run the tests.
+#
+# See src/chrome/test/base/run_all_remoting_unittests.cc for an example.
+
+{
+    'dependencies': [
+      # Used by rule js2unit below.
+      '../v8/tools/gyp/v8.gyp:v8_shell#host',
+    ],
+  'rules': [
+    {
+      'rule_name': 'copyjs',
+      'extension': 'js',
+      'msvs_external_rule': 1,
+      'inputs': [
+        '<(DEPTH)/build/cp.py',
+      ],
+      'outputs': [
+        '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
+      ],
+      'action': [
+        'python',
+        '<@(_inputs)',
+        '<(RULE_INPUT_PATH)',
+        '<@(_outputs)',
+      ],
+    },
+    {
+      'rule_name': 'js2unit',
+      'extension': 'gtestjs',
+      'msvs_external_rule': 1,
+      'inputs': [
+        '<(gypv8sh)',
+        '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
+        '<(mock_js)',
+        '<(accessibility_audit_js)',
+        '<(test_api_js)',
+        '<(js2gtest)',
+      ],
+      'outputs': [
+        '<(INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-gen.cc',
+        '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
+      ],
+      'process_outputs_as_sources': 1,
+      'action': [
+        'python',
+        '<@(_inputs)',
+        'unit',
+        '<(RULE_INPUT_PATH)',
+        'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
+        '<@(_outputs)',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/js_unittest_vars.gypi b/chromium/chrome/js_unittest_vars.gypi
new file mode 100644
index 00000000000..8146ea2d5ab
--- /dev/null
+++ b/chromium/chrome/js_unittest_vars.gypi
@@ -0,0 +1,13 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables' : {
+    'gypv8sh': '<(DEPTH)/tools/gypv8sh.py',
+    'js2gtest': '<(DEPTH)/chrome/test/base/js2gtest.js',
+    'mock_js': '<(DEPTH)/chrome/third_party/mock4js/mock4js.js',
+    'test_api_js': '<(DEPTH)/chrome/test/data/webui/test_api.js',
+    'accessibility_audit_js': '<(DEPTH)/third_party/accessibility-developer-tools/gen/axs_testing.js',
+  },
+}
diff --git a/chromium/chrome/metro_utils.gypi b/chromium/chrome/metro_utils.gypi
new file mode 100644
index 00000000000..000ac259634
--- /dev/null
+++ b/chromium/chrome/metro_utils.gypi
@@ -0,0 +1,23 @@
+# Copyright 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'metro_utils',
+      'type': 'static_library',
+      'dependencies': [
+        'installer_util',
+        '../base/base.gyp:base',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'browser/metro_utils/metro_chrome_win.cc',
+        'browser/metro_utils/metro_chrome_win.h',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/nacl.gypi b/chromium/chrome/nacl.gypi
new file mode 100644
index 00000000000..ab7a03c9956
--- /dev/null
+++ b/chromium/chrome/nacl.gypi
@@ -0,0 +1,70 @@
+# Copyright (c) 2012 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': [
+    ['disable_nacl!=1', {
+      'conditions': [
+        ['OS=="linux"', {
+          'includes': [
+            '../components/nacl/nacl_defines.gypi',
+          ],
+          'targets': [
+            {
+              'target_name': 'nacl_helper',
+              'type': 'executable',
+              'include_dirs': [
+                '..',
+              ],
+              'dependencies': [
+                '../components/nacl.gyp:nacl',
+                '../components/nacl_common.gyp:nacl_common',
+                '../crypto/crypto.gyp:crypto',
+                '../sandbox/sandbox.gyp:libc_urandom_override',
+                '../sandbox/sandbox.gyp:sandbox',
+              ],
+              'defines': [
+                '<@(nacl_defines)',
+              ],
+              'sources': [
+                'nacl/nacl_helper_linux.cc',
+                '../base/posix/unix_domain_socket_linux.cc',
+                '../components/nacl/loader/nacl_sandbox_linux.cc',
+                '../content/common/child_process_sandbox_support_impl_shm_linux.cc',
+                '../content/common/sandbox_init_linux.cc',
+                '../content/common/sandbox_seccomp_bpf_linux.cc',
+                '../content/public/common/content_switches.cc',
+              ],
+              'conditions': [
+                ['toolkit_uses_gtk == 1', {
+                  'dependencies': [
+                    '../build/linux/system.gyp:gtk',
+                  ],
+                }],
+                ['use_glib == 1', {
+                  'dependencies': [
+                    '../build/linux/system.gyp:glib',
+                  ],
+                }],
+                ['os_posix == 1 and OS != "mac"', {
+                  'conditions': [
+                    ['linux_use_tcmalloc==1', {
+                      'dependencies': [
+                        '../base/allocator/allocator.gyp:allocator',
+                      ],
+                    }],
+                  ],
+                }],
+              ],
+              'cflags': ['-fPIE'],
+              'link_settings': {
+                'ldflags': ['-pie'],
+              },
+            },
+          ],
+        }],
+      ],
+    }],
+  ],
+}
diff --git a/chromium/chrome/policy.gypi b/chromium/chrome/policy.gypi
new file mode 100644
index 00000000000..b130c47b1a7
--- /dev/null
+++ b/chromium/chrome/policy.gypi
@@ -0,0 +1,26 @@
+# Copyright (c) 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'policy_path_parser',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../chrome/common_constants.gyp:common_constants',
+        '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'browser/policy/policy_path_parser.h',
+        'browser/policy/policy_path_parser_linux.cc',
+        'browser/policy/policy_path_parser_mac.mm',
+        'browser/policy/policy_path_parser_win.cc',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/test/data/extensions/api_test/api_test_data.gyp b/chromium/chrome/test/data/extensions/api_test/api_test_data.gyp
new file mode 100644
index 00000000000..d3ed68996fb
--- /dev/null
+++ b/chromium/chrome/test/data/extensions/api_test/api_test_data.gyp
@@ -0,0 +1,33 @@
+# Copyright (c) 2013 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.
+
+{
+  'includes': [
+    '../../../../../ppapi/ppapi_nacl_test_common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'socket_ppapi',
+      'type': 'none',
+      'variables': {
+        'nexe_target': 'extensions_api_test_socket_ppapi',
+        'build_newlib': 1,
+        'build_glibc': 0,
+        'build_pnacl_newlib': 0,
+        'nexe_destination_dir': 'test_data/chrome/test/data/extensions/api_test/socket/ppapi',
+        'sources': [
+          'socket/ppapi/test_socket.cc',
+          '<(DEPTH)/ppapi/tests/test_utils.cc',
+          '<(DEPTH)/ppapi/tests/test_utils.h',
+        ],
+        'test_files': [
+          'socket/ppapi/controller.js',
+          'socket/ppapi/index.html',
+          'socket/ppapi/main.js',
+          'socket/ppapi/manifest.json',
+        ],
+      },
+    },
+  ],
+}
diff --git a/chromium/chrome/test/data/nacl/nacl_test_data.gyp b/chromium/chrome/test/data/nacl/nacl_test_data.gyp
new file mode 100644
index 00000000000..52f4fca8829
--- /dev/null
+++ b/chromium/chrome/test/data/nacl/nacl_test_data.gyp
@@ -0,0 +1,309 @@
+# Copyright (c) 2012 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.
+
+{
+  'includes': [
+    '../../../../ppapi/ppapi_nacl_test_common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'shared_test_files',
+      'type': 'none',
+      'variables': {
+        'build_newlib': 1,
+        'build_glibc': 1,
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'test_files': [
+          # TODO(ncbray) move into chrome/test/data/nacl when all tests are
+          # converted.
+          '<(DEPTH)/ppapi/native_client/tests/ppapi_browser/progress_event_listener.js',
+          '<(DEPTH)/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad.js',
+          '<(DEPTH)/ppapi/native_client/tools/browser_tester/browserdata/nacltest.js',
+        ],
+      },
+    },
+    {
+      'target_name': 'simple_test',
+      'type': 'none',
+      'variables': {
+        'nexe_target': 'simple',
+        'build_newlib': 1,
+        'build_glibc': 1,
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'sources': [
+          'simple.cc',
+        ],
+        'test_files': [
+          'nacl_load_test.html',
+        ],
+      },
+    },
+    {
+      'target_name': 'exit_status_test',
+      'type': 'none',
+      'variables': {
+        'nexe_target': 'pm_exit_status_test',
+        'build_newlib': 1,
+        'build_glibc': 1,
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'sources': [
+          'exit_status/pm_exit_status_test.cc',
+        ],
+        'test_files': [
+          'exit_status/pm_exit_status_test.html',
+        ],
+      },
+    },
+    {
+      'target_name': 'sysconf_nprocessors_onln_test',
+      'type': 'none',
+      'variables': {
+        'nexe_target': 'sysconf_nprocessors_onln_test',
+        'build_newlib': 1,
+        'build_glibc': 1,
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'sources': [
+          'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.cc',
+        ],
+        'test_files': [
+          'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.html',
+        ],
+      },
+    },
+    {
+      'target_name': 'ppapi_test_lib',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libppapi_test_lib.a',
+        'nso_target': 'libppapi_test_lib.so',
+        'build_newlib': 1,
+        'build_glibc': 1,
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'sources': [
+          # TODO(ncbray) move these files once SCons no longer depends on them.
+          '../../../../ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc',
+          '../../../../ppapi/native_client/tests/ppapi_test_lib/internal_utils.cc',
+          '../../../../ppapi/native_client/tests/ppapi_test_lib/module_instance.cc',
+          '../../../../ppapi/native_client/tests/ppapi_test_lib/testable_callback.cc',
+          '../../../../ppapi/native_client/tests/ppapi_test_lib/test_interface.cc',
+        ]
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+      ],
+    },
+    {
+      'target_name': 'ppapi_progress_events',
+      'type': 'none',
+      'variables': {
+        'nexe_target': 'ppapi_progress_events',
+        'build_newlib': 1,
+        'build_glibc': 1,
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'link_flags': [
+          '-lppapi',
+          '-lppapi_test_lib',
+          '-lplatform',
+          '-lgio',
+        ],
+        'sources': [
+          'progress_events/ppapi_progress_events.cc',
+        ],
+        'test_files': [
+          'progress_events/ppapi_progress_events.html',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+        '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
+        '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
+        '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+        'ppapi_test_lib',
+      ],
+    },
+    {
+      'target_name': 'pnacl_error_handling_test',
+      'type': 'none',
+      'variables': {
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        # No need to translate AOT.
+        'enable_x86_32': 0,
+        'enable_x86_64': 0,
+        'enable_arm': 0,
+        # Use prebuilt NMF files.
+        'generate_nmf': 0,
+        'test_files': [
+          'pnacl_error_handling/pnacl_error_handling.html',
+          'pnacl_error_handling/bad.pexe',
+          'pnacl_error_handling/pnacl_bad_pexe.nmf',
+          'pnacl_error_handling/pnacl_bad_doesnotexist.nmf',
+          'pnacl_error_handling/pnacl_illformed_manifest.nmf',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+      ]
+    },
+    {
+      'target_name': 'pnacl_mime_type_test',
+      'type': 'none',
+      'variables': {
+        'build_newlib': 1,
+        'build_glibc': 1,
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        # No need to translate AOT.
+        'enable_x86_32': 0,
+        'enable_x86_64': 0,
+        'enable_arm': 0,
+        'test_files': [
+          'pnacl_mime_type/pnacl_mime_type.html',
+        ],
+      },
+    },
+    {
+      'target_name': 'pnacl_options_test',
+      'type': 'none',
+      'variables': {
+        'nexe_target': 'pnacl_options',
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        # No need to translate these AOT, when we just need the pexe.
+        'enable_x86_32': 0,
+        'enable_x86_64': 0,
+        'enable_arm': 0,
+        'sources': [
+          'simple.cc',
+        ],
+        'test_files': [
+          'pnacl_nmf_options/pnacl_options.html',
+          'pnacl_nmf_options/pnacl_o_0.nmf',
+          'pnacl_nmf_options/pnacl_o_2.nmf',
+          'pnacl_nmf_options/pnacl_o_large.nmf',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+      ]
+    },
+    {
+      'target_name': 'pnacl_dyncode_syscall_disabled_test',
+      'type': 'none',
+      'variables': {
+        # This tests that nexes produced by translation in the browser are not
+        # able to use the dyncode syscalls.  Pre-translated nexes are not
+        # subject to this constraint, so we do not test them.
+        'enable_x86_32': 0,
+        'enable_x86_64': 0,
+        'enable_arm': 0,
+        'nexe_target': 'pnacl_dyncode_syscall_disabled',
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'link_flags': [
+          '-lppapi',
+          '-lppapi_test_lib',
+          '-lplatform',
+          '-lgio',
+          # The "_private" variant of the library calls the syscalls
+          # directly, which allows us to test the syscalls directly,
+          # even when the dyncode IRT interface is also disabled under
+          # PNaCl.
+          '-lnacl_dyncode_private',
+        ],
+        'sources': [
+          'pnacl_dyncode_syscall_disabled/pnacl_dyncode_syscall_disabled.cc',
+        ],
+        'test_files': [
+          'pnacl_dyncode_syscall_disabled/pnacl_dyncode_syscall_disabled.html',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
+        '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
+        '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_dyncode_private_lib',
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+        '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+        'ppapi_test_lib',
+      ],
+    },
+    {
+      'target_name': 'pnacl_exception_handling_disabled_test',
+      'type': 'none',
+      'variables': {
+        # This tests that nexes produced by translation in the browser are not
+        # able to use hardware exception handling.  Pre-translated nexes are
+        # not subject to this constraint, so we do not test them.
+        'enable_x86_32': 0,
+        'enable_x86_64': 0,
+        'enable_arm': 0,
+        'nexe_target': 'pnacl_exception_handling_disabled',
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'link_flags': [
+          '-lppapi',
+          '-lppapi_test_lib',
+          '-lplatform',
+          '-lgio',
+          '-lnacl_exception',
+        ],
+        'sources': [
+          'pnacl_exception_handling_disabled/pnacl_exception_handling_disabled.cc',
+        ],
+        'test_files': [
+          'pnacl_exception_handling_disabled/pnacl_exception_handling_disabled.html',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
+        '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
+        '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_lib',
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+        '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+        'ppapi_test_lib',
+      ],
+    },
+    # Legacy NaCl PPAPI interface tests being here.
+    {
+      'target_name': 'ppapi_ppb_core',
+      'type': 'none',
+      'variables': {
+        'nexe_target': 'ppapi_ppb_core',
+        'build_newlib': 1,
+        'build_glibc': 1,
+        'build_pnacl_newlib': 1,
+        'nexe_destination_dir': 'nacl_test_data',
+        'link_flags': [
+          '-lppapi',
+          '-lppapi_test_lib',
+          '-lplatform',
+          '-lgio',
+        ],
+        'sources': [
+          'ppapi/ppb_core/ppapi_ppb_core.cc',
+        ],
+        'test_files': [
+          'ppapi/ppb_core/ppapi_ppb_core.html',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+        '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
+        '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
+        '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+        'ppapi_test_lib',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/test/gpu/test_support_gpu.gypi b/chromium/chrome/test/gpu/test_support_gpu.gypi
new file mode 100644
index 00000000000..f2c9b57a307
--- /dev/null
+++ b/chromium/chrome/test/gpu/test_support_gpu.gypi
@@ -0,0 +1,113 @@
+# Copyright (c) 2012 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.
+
+# This file is meant to be included into targets which run gpu tests.
+{
+  'variables': {
+     'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu',
+     'src_dir': '../../..',
+  },
+  'dependencies': [
+    'browser',
+    'chrome',
+    'chrome_resources.gyp:chrome_resources',
+    'chrome_resources.gyp:chrome_strings',
+    'renderer',
+    'test_support_common',
+    'test_support_ui',
+    '<(src_dir)/base/base.gyp:base',
+    '<(src_dir)/base/base.gyp:test_support_base',
+    '<(src_dir)/net/net.gyp:net_test_support',
+    '<(src_dir)/skia/skia.gyp:skia',
+    '<(src_dir)/testing/gmock.gyp:gmock',
+    '<(src_dir)/testing/gtest.gyp:gtest',
+    '<(src_dir)/third_party/icu/icu.gyp:icui18n',
+    '<(src_dir)/third_party/icu/icu.gyp:icuuc',
+  ],
+  'defines': [
+    'HAS_OUT_OF_PROC_TEST_RUNNER',
+  ],
+  'include_dirs': [
+    '<(src_dir)',
+    '<(test_list_out_dir)',
+  ],
+  'sources': [
+    '<(src_dir)/chrome/test/base/chrome_test_launcher.cc',
+  ],
+  # hard_dependency is necessary for this target because it has actions
+  # that generate a header file included by dependent targets. The header
+  # file must be generated before the dependents are compiled. The usual
+  # semantics are to allow the two targets to build concurrently.
+  'hard_dependency': 1,
+  'conditions': [
+    ['OS=="win"', {
+      'dependencies': [
+        'chrome_version_resources',
+      ],
+      'include_dirs': [
+        '<(DEPTH)/third_party/wtl/include',
+      ],
+      'sources': [
+        '<(src_dir)/chrome/app/chrome_dll.rc',
+        '<(src_dir)/chrome/app/chrome_dll_resource.h',
+        '<(src_dir)/chrome/app/chrome_version.rc.version',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
+      ],
+      'conditions': [
+        ['win_use_allocator_shim==1', {
+          'dependencies': [
+            '<(allocator_target)',
+          ],
+        }],
+      ],
+      'configurations': {
+        'Debug': {
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+            },
+          },
+        },
+      },
+    }],
+    ['OS=="mac"', {
+      # See comments about "xcode_settings" elsewhere in this file.
+      'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+    }],
+    ['toolkit_uses_gtk == 1', {
+       'dependencies': [
+         '<(src_dir)/build/linux/system.gyp:gtk',
+       ],
+    }],
+    ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+      'dependencies': [
+        '<(src_dir)/build/linux/system.gyp:ssl',
+      ],
+    }],
+    ['toolkit_views==1', {
+      'dependencies': [
+       '<(src_dir)/ui/views/views.gyp:views',
+      ],
+    }],
+    ['OS=="android"', {
+      'dependencies!': [
+        'chrome',
+      ],
+      'dependencies': [
+        '<@(chromium_browser_dependencies)',
+        '<@(chromium_child_dependencies)',
+        '../content/content.gyp:content_app_both',
+        'chrome_resources.gyp:packed_resources',
+        'chrome_resources.gyp:packed_extra_resources',
+      ],
+    }],
+  ],
+}
diff --git a/chromium/chrome/test/security_tests/security_tests.gyp b/chromium/chrome/test/security_tests/security_tests.gyp
new file mode 100644
index 00000000000..8362877a350
--- /dev/null
+++ b/chromium/chrome/test/security_tests/security_tests.gyp
@@ -0,0 +1,22 @@
+# Copyright (c) 2009 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': {
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'security_tests',
+      'type': 'shared_library',
+      'sources': [
+        '../../../sandbox/win/tests/validation_tests/commands.cc',
+        '../../../sandbox/win/tests/validation_tests/commands.h',
+        'ipc_security_tests.cc',
+        'ipc_security_tests.h',
+        'security_tests.cc',
+      ],
+    },
+  ],
+}
diff --git a/chromium/chrome/tools/build/repack_locales.py b/chromium/chrome/tools/build/repack_locales.py
new file mode 100755
index 00000000000..a43e17177a8
--- /dev/null
+++ b/chromium/chrome/tools/build/repack_locales.py
@@ -0,0 +1,218 @@
+#!/usr/bin/env python
+# Copyright (c) 2012 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.
+
+"""Helper script to repack paks for a list of locales.
+
+Gyp doesn't have any built-in looping capability, so this just provides a way to
+loop over a list of locales when repacking pak files, thus avoiding a
+proliferation of mostly duplicate, cut-n-paste gyp actions.
+"""
+
+import optparse
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..',
+                             'tools', 'grit'))
+from grit.format import data_pack
+
+# The gyp "branding" variable.
+BRANDING = None
+
+# Some build paths defined by gyp.
+GRIT_DIR = None
+SHARE_INT_DIR = None
+INT_DIR = None
+
+# The target platform. If it is not defined, sys.platform will be used.
+OS = None
+
+# Extra input files.
+EXTRA_INPUT_FILES = []
+
+class Usage(Exception):
+  def __init__(self, msg):
+    self.msg = msg
+
+
+def calc_output(locale):
+  """Determine the file that will be generated for the given locale."""
+  #e.g. '<(INTERMEDIATE_DIR)/repack/da.pak',
+  # For Fake Bidi, generate it at a fixed path so that tests can safely
+  # reference it.
+  if locale == 'fake-bidi':
+    return '%s/%s.pak' % (INT_DIR, locale)
+  if OS == 'mac' or OS == 'ios':
+    # For Cocoa to find the locale at runtime, it needs to use '_' instead
+    # of '-' (http://crbug.com/20441).  Also, 'en-US' should be represented
+    # simply as 'en' (http://crbug.com/19165, http://crbug.com/25578).
+    if locale == 'en-US':
+      locale = 'en'
+    return '%s/repack/%s.lproj/locale.pak' % (INT_DIR, locale.replace('-', '_'))
+  else:
+    return os.path.join(INT_DIR, 'repack', locale + '.pak')
+
+
+def calc_inputs(locale):
+  """Determine the files that need processing for the given locale."""
+  inputs = []
+
+  #e.g. '<(grit_out_dir)/generated_resources_da.pak'
+  inputs.append(os.path.join(GRIT_DIR, 'generated_resources_%s.pak' % locale))
+
+  #e.g. '<(grit_out_dir)/locale_settings_da.pak'
+  inputs.append(os.path.join(GRIT_DIR, 'locale_settings_%s.pak' % locale))
+
+  #e.g. '<(grit_out_dir)/platform_locale_settings_da.pak'
+  inputs.append(os.path.join(GRIT_DIR,
+                'platform_locale_settings_%s.pak' % locale))
+
+  #e.g. '<(SHARED_INTERMEDIATE_DIR)/components/strings/
+  # component_strings_da.pak',
+  inputs.append(os.path.join(SHARE_INT_DIR, 'components', 'strings',
+                'component_strings_%s.pak' % locale))
+
+  if OS != 'ios':
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
+    inputs.append(os.path.join(SHARE_INT_DIR, 'webkit',
+                  'webkit_strings_%s.pak' % locale))
+
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings_da.pak',
+    inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'ui_strings',
+                  'ui_strings_%s.pak' % locale))
+
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ash_strings/ash_strings_da.pak',
+    inputs.append(os.path.join(SHARE_INT_DIR, 'ash_strings',
+                  'ash_strings_%s.pak' % locale))
+
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings/
+    # device_bluetooth_strings_da.pak',
+    inputs.append(os.path.join(SHARE_INT_DIR, 'device', 'bluetooth', 'strings',
+                  'device_bluetooth_strings_%s.pak' % locale))
+
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings_da.pak',
+    inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'app_locale_settings',
+                  'app_locale_settings_%s.pak' % locale))
+
+  #e.g. '<(grit_out_dir)/google_chrome_strings_da.pak'
+  #     or
+  #     '<(grit_out_dir)/chromium_strings_da.pak'
+  inputs.append(os.path.join(
+      GRIT_DIR, '%s_strings_%s.pak' % (BRANDING, locale)))
+
+  # Add any extra input files.
+  for extra_file in EXTRA_INPUT_FILES:
+    inputs.append('%s_%s.pak' % (extra_file, locale))
+
+  return inputs
+
+
+def list_outputs(locales):
+  """Returns the names of files that will be generated for the given locales.
+
+  This is to provide gyp the list of output files, so build targets can
+  properly track what needs to be built.
+  """
+  outputs = []
+  for locale in locales:
+    outputs.append(calc_output(locale))
+  # Quote each element so filename spaces don't mess up gyp's attempt to parse
+  # it into a list.
+  return " ".join(['"%s"' % x for x in outputs])
+
+
+def list_inputs(locales):
+  """Returns the names of files that will be processed for the given locales.
+
+  This is to provide gyp the list of input files, so build targets can properly
+  track their prerequisites.
+  """
+  inputs = []
+  for locale in locales:
+    inputs += calc_inputs(locale)
+  # Quote each element so filename spaces don't mess up gyp's attempt to parse
+  # it into a list.
+  return " ".join(['"%s"' % x for x in inputs])
+
+
+def repack_locales(locales):
+  """ Loop over and repack the given locales."""
+  for locale in locales:
+    inputs = []
+    inputs += calc_inputs(locale)
+    output = calc_output(locale)
+    data_pack.DataPack.RePack(output, inputs)
+
+
+def DoMain(argv):
+  global BRANDING
+  global GRIT_DIR
+  global SHARE_INT_DIR
+  global INT_DIR
+  global OS
+  global EXTRA_INPUT_FILES
+
+  parser = optparse.OptionParser("usage: %prog [options] locales")
+  parser.add_option("-i", action="store_true", dest="inputs", default=False,
+                    help="Print the expected input file list, then exit.")
+  parser.add_option("-o", action="store_true", dest="outputs", default=False,
+                    help="Print the expected output file list, then exit.")
+  parser.add_option("-g", action="store", dest="grit_dir",
+                    help="GRIT build files output directory.")
+  parser.add_option("-x", action="store", dest="int_dir",
+                    help="Intermediate build files output directory.")
+  parser.add_option("-s", action="store", dest="share_int_dir",
+                    help="Shared intermediate build files output directory.")
+  parser.add_option("-b", action="store", dest="branding",
+                    help="Branding type of this build.")
+  parser.add_option("-e", action="append", dest="extra_input", default=[],
+                    help="Full path to an extra input pak file without the\
+                         locale suffix and \".pak\" extension.")
+  parser.add_option("-p", action="store", dest="os",
+                    help="The target OS. (e.g. mac, linux, win, etc.)")
+  options, locales = parser.parse_args(argv)
+
+  if not locales:
+    parser.error('Please specificy at least one locale to process.\n')
+
+  print_inputs = options.inputs
+  print_outputs = options.outputs
+  GRIT_DIR = options.grit_dir
+  INT_DIR = options.int_dir
+  SHARE_INT_DIR = options.share_int_dir
+  BRANDING = options.branding
+  EXTRA_INPUT_FILES = options.extra_input
+  OS = options.os
+
+  if not OS:
+    if sys.platform == 'darwin':
+      OS = 'mac'
+    elif sys.platform.startswith('linux'):
+      OS = 'linux'
+    elif sys.platform in ('cygwin', 'win32'):
+      OS = 'win'
+    else:
+      OS = sys.platform
+
+  if not (GRIT_DIR and INT_DIR and SHARE_INT_DIR):
+    parser.error('Please specify all of "-g" and "-x" and "-s".\n')
+  if print_inputs and print_outputs:
+    parser.error('Please specify only one of "-i" or "-o".\n')
+  # Need to know the branding, unless we're just listing the outputs.
+  if not print_outputs and not BRANDING:
+    parser.error('Please specify "-b" to determine the input files.\n')
+
+  if print_inputs:
+    return list_inputs(locales)
+
+  if print_outputs:
+    return list_outputs(locales)
+
+  return repack_locales(locales)
+
+if __name__ == '__main__':
+  results = DoMain(sys.argv[1:])
+  if results:
+    print results
diff --git a/chromium/chrome/tools/build/version.py b/chromium/chrome/tools/build/version.py
new file mode 100755
index 00000000000..09604b7db98
--- /dev/null
+++ b/chromium/chrome/tools/build/version.py
@@ -0,0 +1,197 @@
+#!/usr/bin/env python
+# Copyright (c) 2009 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.
+
+"""
+version.py -- Chromium version string substitution utility.
+"""
+
+import getopt
+import os
+import sys
+
+
+class Usage(Exception):
+  def __init__(self, msg):
+    self.msg = msg
+
+
+def fetch_values_from_file(values_dict, file_name):
+  """
+  Fetches KEYWORD=VALUE settings from the specified file.
+
+  Everything to the left of the first '=' is the keyword,
+  everything to the right is the value.  No stripping of
+  white space, so beware.
+
+  The file must exist, otherwise you get the Python exception from open().
+  """
+  for line in open(file_name, 'r').readlines():
+    key, val = line.rstrip('\r\n').split('=', 1)
+    values_dict[key] = val
+
+
+def fetch_values(file_list):
+  """
+  Returns a dictionary of values to be used for substitution, populating
+  the dictionary with KEYWORD=VALUE settings from the files in 'file_list'.
+
+  Explicitly adds the following value from internal calculations:
+
+    OFFICIAL_BUILD
+  """
+  CHROME_BUILD_TYPE = os.environ.get('CHROME_BUILD_TYPE')
+  if CHROME_BUILD_TYPE == '_official':
+    official_build = '1'
+  else:
+    official_build = '0'
+
+  values = dict(
+    OFFICIAL_BUILD = official_build,
+  )
+
+  for file_name in file_list:
+    fetch_values_from_file(values, file_name)
+
+  return values
+
+
+def subst_template(contents, values):
+  """
+  Returns the template with substituted values from the specified dictionary.
+
+  Keywords to be substituted are surrounded by '@':  @KEYWORD@.
+
+  No attempt is made to avoid recursive substitution.  The order
+  of evaluation is random based on the order of the keywords returned
+  by the Python dictionary.  So do NOT substitute a value that
+  contains any @KEYWORD@ strings expecting them to be recursively
+  substituted, okay?
+  """
+  for key, val in values.iteritems():
+    try:
+      contents = contents.replace('@' + key + '@', val)
+    except TypeError:
+      print repr(key), repr(val)
+  return contents
+
+
+def subst_file(file_name, values):
+  """
+  Returns the contents of the specified file_name with substited
+  values from the specified dictionary.
+
+  This is like subst_template, except it operates on a file.
+  """
+  template = open(file_name, 'r').read()
+  return subst_template(template, values);
+
+
+def write_if_changed(file_name, contents):
+  """
+  Writes the specified contents to the specified file_name
+  iff the contents are different than the current contents.
+  """
+  try:
+    old_contents = open(file_name, 'r').read()
+  except EnvironmentError:
+    pass
+  else:
+    if contents == old_contents:
+      return
+    os.unlink(file_name)
+  open(file_name, 'w').write(contents)
+
+
+def main(argv=None):
+  if argv is None:
+    argv = sys.argv
+
+  short_options = 'e:f:i:o:t:h'
+  long_options = ['eval=', 'file=', 'help']
+
+  helpstr = """\
+Usage:  version.py [-h] [-f FILE] ([[-i] FILE] | -t TEMPLATE) [[-o] FILE]
+
+  -f FILE, --file=FILE              Read variables from FILE.
+  -i FILE, --input=FILE             Read strings to substitute from FILE.
+  -o FILE, --output=FILE            Write substituted strings to FILE.
+  -t TEMPLATE, --template=TEMPLATE  Use TEMPLATE as the strings to substitute.
+  -e VAR=VAL, --eval=VAR=VAL        Evaluate VAL after reading variables. Can
+                                    be used to synthesize variables. e.g.
+                                    -e 'PATCH_HI=int(PATCH)/256'.
+  -h, --help                        Print this help and exit.
+"""
+
+  evals = {}
+  variable_files = []
+  in_file = None
+  out_file = None
+  template = None
+
+  try:
+    try:
+      opts, args = getopt.getopt(argv[1:], short_options, long_options)
+    except getopt.error, msg:
+      raise Usage(msg)
+    for o, a in opts:
+      if o in ('-e', '--eval'):
+        try:
+          evals.update(dict([a.split('=',1)]))
+        except ValueError:
+          raise Usage("-e requires VAR=VAL")
+      elif o in ('-f', '--file'):
+        variable_files.append(a)
+      elif o in ('-i', '--input'):
+        in_file = a
+      elif o in ('-o', '--output'):
+        out_file = a
+      elif o in ('-t', '--template'):
+        template = a
+      elif o in ('-h', '--help'):
+        print helpstr
+        return 0
+    while len(args) and (in_file is None or out_file is None or
+                         template is None):
+      if in_file is None:
+        in_file = args.pop(0)
+      elif out_file is None:
+        out_file = args.pop(0)
+    if args:
+      msg = 'Unexpected arguments: %r' % args
+      raise Usage(msg)
+  except Usage, err:
+    sys.stderr.write(err.msg)
+    sys.stderr.write('; Use -h to get help.\n')
+    return 2
+
+  values = fetch_values(variable_files)
+  for key, val in evals.iteritems():
+    values[key] = str(eval(val, globals(), values))
+
+  if template is not None:
+    contents = subst_template(template, values)
+  elif in_file:
+    contents = subst_file(in_file, values)
+  else:
+    # Generate a default set of version information.
+    contents = """MAJOR=%(MAJOR)s
+MINOR=%(MINOR)s
+BUILD=%(BUILD)s
+PATCH=%(PATCH)s
+LASTCHANGE=%(LASTCHANGE)s
+OFFICIAL_BUILD=%(OFFICIAL_BUILD)s
+""" % values
+
+
+  if out_file:
+    write_if_changed(out_file, contents)
+  else:
+    print contents
+
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/chromium/chrome/version.gypi b/chromium/chrome/version.gypi
new file mode 100644
index 00000000000..f1af6fdc9bd
--- /dev/null
+++ b/chromium/chrome/version.gypi
@@ -0,0 +1,18 @@
+# Copyright (c) 2012 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': {
+    'variables': {
+      'version_py_path': '<(DEPTH)/chrome/tools/build/version.py',
+      'version_path': 'VERSION',
+    },
+    'version_py_path': '<(version_py_path)',
+    'version_path': '<(version_path)',
+    'version_full':
+        '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
+    'version_mac_dylib':
+        '<!(python <(version_py_path) -f <(version_path) -t "@BUILD@.@PATCH_HI@.@PATCH_LO@" -e "PATCH_HI=int(PATCH)/256" -e "PATCH_LO=int(PATCH)%256")',
+  },  # variables
+}
diff --git a/chromium/chrome/version_resource_rules.gypi b/chromium/chrome/version_resource_rules.gypi
new file mode 100644
index 00000000000..772d453d380
--- /dev/null
+++ b/chromium/chrome/version_resource_rules.gypi
@@ -0,0 +1,67 @@
+# Copyright (c) 2012 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.
+
+# This file defines rules that allow you to generate version resources for
+# Windows images.
+
+# Include 'version.gypi' at the top of your GYP file to define
+# the required variables:
+#
+#  'includes': [
+#    '<(DEPTH)/chrome/version.gypi',
+#  ],
+#
+# Then include this rule file in a productname_resources target:
+# 
+#    {
+#      'target_name': 'chrome_version_resources',
+#      ...
+#      'variables': {
+#        'output_dir': 'product_version',
+#        'branding_path': 'some/branding/file',
+#        'template_input_path': 'some/product_version.rc.version',
+#        'extra_variable_files_arguments': [ '-f', 'some/file/with/variables' ],
+#        'extra_variable_files': [ 'some/file/with/variables' ], # NOTE: matches that above
+#      },
+#      'includes': [
+#        '<(DEPTH)/chrome/version_resource_rules.gypi',
+#      ],
+#    }
+#
+{
+  'rules': [
+    {
+      'rule_name': 'version',
+      'extension': 'ver',
+      'variables': {
+        'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
+	'extra_variable_files%': [],
+        'extra_variable_files_arguments%': [],
+      },
+      'inputs': [
+        '<(version_py_path)',
+        '<(version_path)',
+        '<(branding_path)',
+        '<(lastchange_path)',
+        '<@(extra_variable_files)',
+        '<(template_input_path)',
+      ],
+      'outputs': [
+        '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)/<(RULE_INPUT_ROOT)_version.rc',
+      ],
+      'action': [
+        'python',
+        '<(version_py_path)',
+        '-f', '<(RULE_INPUT_PATH)',
+        '-f', '<(version_path)',
+        '-f', '<(branding_path)',
+        '-f', '<(lastchange_path)',
+        '<@(extra_variable_files_arguments)',
+        '<(template_input_path)',
+        '<@(_outputs)',
+      ],
+      'message': 'Generating version information in <@(_outputs)'
+    },
+  ],
+}