Componentize objc_zombie.{h,mm} and consolidate crash_keys.

Consolidate both crash_keys.{cc,h} and objc_zombie.{h,mm}} into
components/crash/core/common so that they can be used on iOS and
that there is only one component related to crash support.

Tighten the DEPS rules because stc/components/crash/core cannot
depend on src/breakpad.

BUG=522955,520968

Review URL: https://codereview.chromium.org/1358483002

Cr-Commit-Position: refs/heads/master@{#350132}

37 files changed, 133 insertions, 103 deletions

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 711fc35..ba9042d 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -107,7 +107,7 @@ if (!is_android) {
         "//chrome_elf",
         "//components/browser_watcher:browser_watcher_client",
         "//components/crash/content/app",
-        "//components/crash_keys",
+        "//components/crash/core/common",
         "//content:startup_helper_win",
         "//crypto",
         "//sandbox",
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index c16628b..c046f82 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -63,8 +63,8 @@
 #include "chrome/app/chrome_main_mac.h"
 #include "chrome/browser/mac/relauncher.h"
 #include "chrome/common/mac/cfbundle_blocker.h"
-#include "chrome/common/mac/objc_zombie.h"
 #include "components/crash/content/app/crashpad_mac.h"
+#include "components/crash/core/common/objc_zombie.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #endif
 
diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm
index 6d7c11c..1949c5e 100644
--- a/chrome/browser/chrome_browser_application_mac.mm
+++ b/chrome/browser/chrome_browser_application_mac.mm
@@ -22,7 +22,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/crash_keys.h"
-#import "chrome/common/mac/objc_zombie.h"
+#import "components/crash/core/common/objc_zombie.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 37c315a..43fa5d2 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -43,8 +43,8 @@
       'common/common_param_traits.cc',
       'common/common_param_traits.h',
       'common/common_param_traits_macros.h',
-      'common/component_flash_hint_file_linux.h',
       'common/component_flash_hint_file_linux.cc',
+      'common/component_flash_hint_file_linux.h',
       'common/content_restriction.h',
       'common/content_settings_pattern_serializer.cc',
       'common/content_settings_pattern_serializer.h',
@@ -69,8 +69,6 @@
       'common/mac/cfbundle_blocker.mm',
       'common/mac/launchd.h',
       'common/mac/launchd.mm',
-      'common/mac/objc_zombie.h',
-      'common/mac/objc_zombie.mm',
       'common/media/webrtc_logging_message_data.cc',
       'common/media/webrtc_logging_message_data.h',
       'common/media/webrtc_logging_messages.h',
@@ -331,7 +329,7 @@
         '<(DEPTH)/components/components.gyp:cloud_devices_common',
         '<(DEPTH)/components/components.gyp:component_updater',
         '<(DEPTH)/components/components.gyp:content_settings_core_common',
-        '<(DEPTH)/components/components.gyp:crash_keys',
+        '<(DEPTH)/components/components.gyp:crash_core_common',
         '<(DEPTH)/components/components.gyp:favicon_base',
         '<(DEPTH)/components/components.gyp:gcm_driver_common',
         '<(DEPTH)/components/components.gyp:json_schema',
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index adc8893..54d5a80 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -415,7 +415,7 @@
             '../breakpad/breakpad.gyp:breakpad_sender',
             '../chrome_elf/chrome_elf.gyp:chrome_elf',
             '../components/components.gyp:crash_component',
-            '../components/components.gyp:crash_keys',
+            '../components/components.gyp:crash_core_common',
             '../sandbox/sandbox.gyp:sandbox',
             '../ui/gfx/gfx.gyp:gfx',
             '../win8/metro_driver/metro_driver.gyp:metro_driver',
@@ -551,7 +551,7 @@
                 '../breakpad/breakpad.gyp:breakpad_handler_win64',
                 '../breakpad/breakpad.gyp:breakpad_sender_win64',
                 '../components/components.gyp:breakpad_win64',
-                '../components/components.gyp:crash_keys_win64',
+                '../components/components.gyp:crash_core_common_win64',
                 '../chrome/common_constants.gyp:common_constants_win64',
                 '../components/nacl.gyp:nacl_win64',
                 '../crypto/crypto.gyp:crypto_nacl_win64',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 83e640b..f26852a 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -498,7 +498,6 @@
       'common/mac/cfbundle_blocker_unittest.mm',
       'common/mac/mock_launchd.cc',
       'common/mac/mock_launchd.h',
-      'common/mac/objc_zombie_unittest.mm',
       'common/partial_circular_buffer_unittest.cc',
       'common/pref_names_util_unittest.cc',
       'common/search_urls_unittest.cc',
@@ -617,8 +616,8 @@
       'browser/extensions/api/declarative/rules_registry_service_unittest.cc',
       'browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc',
       'browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc',
-      'browser/extensions/api/declarative_content/content_condition_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/declarative_content_condition_tracker_test.cc',
       'browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h',
       'browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc',
@@ -2775,7 +2774,7 @@
         # 1) everything that the chrome binaries depend on:
         '<@(chromium_browser_dependencies)',
         '<@(chromium_child_dependencies)',
-        '../components/components.gyp:crash_keys',
+        '../components/components.gyp:crash_core_common',
         '../content/content.gyp:content_app_both',
         # 2) test-specific support libraries:
         '../base/base.gyp:run_all_unittests',
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 7a8f7a7..22b3044 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -63,7 +63,7 @@ static_library("common") {
     "//components/cloud_devices/common",
     "//components/component_updater",
     "//components/content_settings/core/common",
-    "//components/crash_keys",
+    "//components/crash/core/common",
     "//components/favicon_base",
     "//components/gcm_driver/common",
     "//components/json_schema",
diff --git a/chrome/common/DEPS b/chrome/common/DEPS
index c653356..f00f3dc 100644
--- a/chrome/common/DEPS
+++ b/chrome/common/DEPS
@@ -7,7 +7,7 @@ include_rules = [
   "+components/bookmarks/common",
   "+components/cloud_devices/common",
   "+components/content_settings/core/common",
-  "+components/crash_keys",
+  "+components/crash/core/common",
   "+components/crx_file",
   "+components/data_reduction_proxy/content/common",
   "+components/data_reduction_proxy/core/common",
diff --git a/chrome/common/crash_keys.h b/chrome/common/crash_keys.h
index acf3cbe..60bd26e 100644
--- a/chrome/common/crash_keys.h
+++ b/chrome/common/crash_keys.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/debug/crash_logging.h"
-#include "components/crash_keys/crash_keys.h"
+#include "components/crash/core/common/crash_keys.h"
 
 namespace base {
 class CommandLine;
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 0f5d4e4..460dcde 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1937,7 +1937,7 @@ if (!is_android) {
         "//breakpad:client",
         "//chrome/browser",
         "//chrome/child",
-        "//components/crash_keys",
+        "//components/crash/core/common",
         "//base/test:run_all_unittests",
         "//base/test:test_support",
       ]
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 2b6718d..7707766 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -35,6 +35,7 @@ group("all_components") {
     "//components/compression",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
+    "//components/crash/core/common",
     "//components/crash/content/app",
     "//components/crash/content/browser",
     "//components/crx_file",
@@ -318,6 +319,7 @@ test("components_unittests") {
     "//components/component_updater:unit_tests",
     "//components/content_settings/core/browser:unit_tests",
     "//components/content_settings/core/common:unit_tests",
+    "//components/crash/core/common:unit_tests",
     "//components/crx_file:unit_tests",
     "//components/data_reduction_proxy/content/browser:unit_tests",
     "//components/data_reduction_proxy/core/browser:unit_tests",
diff --git a/components/components.gyp b/components/components.gyp
index 054dff8..0eb812e 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -22,7 +22,6 @@
     'compression.gypi',
     'content_settings.gypi',
     'crash.gypi',
-    'crash_keys.gypi',
     'cronet.gypi',
     'crx_file.gypi',
     'data_reduction_proxy.gypi',
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index dab41ea..f2917db 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -120,6 +120,7 @@
     ],
     'crash_unittest_sources': [
       'crash/content/app/crash_keys_win_unittest.cc',
+      'crash/core/common/objc_zombie_unittest.mm',
     ],
     'crx_file_unittest_sources': [
       'crx_file/id_util_unittest.cc',
@@ -910,6 +911,7 @@
         'components.gyp:content_settings_core_browser',
         'components.gyp:content_settings_core_common',
         'components.gyp:content_settings_core_test_support',
+        'components.gyp:crash_core_common',
         'components.gyp:crx_file',
         'components.gyp:data_reduction_proxy_core_browser',
         'components.gyp:data_reduction_proxy_core_common',
@@ -995,6 +997,11 @@
         'url_formatter/url_formatter.gyp:url_formatter',
       ],
       'conditions': [
+        ['OS!="mac" and OS!="ios"', {
+          'sources!': [
+            'crash/core/common/objc_zombie_unittest.mm',
+          ],
+        }],
         ['enable_rlz_support==1', {
           'sources': [
             '<@(rlz_unittest_sources)',
diff --git a/components/crash.gypi b/components/crash.gypi
index 05b3bea..6acfdfc 100644
--- a/components/crash.gypi
+++ b/components/crash.gypi
@@ -3,7 +3,59 @@
 # found in the LICENSE file.
 
 {
+  'targets': [
+    {
+      # GN version: //components/crash/core/common
+      'target_name': 'crash_core_common',
+      'type': 'static_library',
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        # List of dependencies is intentionally very minimal. Please avoid
+        # adding extra dependencies without first checking with OWNERS.
+        '../base/base.gyp:base',
+      ],
+      'sources': [
+        'crash/core/common/crash_keys.cc',
+        'crash/core/common/crash_keys.h',
+      ],
+      'conditions': [
+        ['OS=="mac" or OS=="ios"', {
+          'sources': [
+            'crash/core/common/objc_zombie.h',
+            'crash/core/common/objc_zombie.mm',
+          ],
+        }],
+      ],
+    },
+  ],
   'conditions': [
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
+          'target_name': 'crash_core_common_win64',
+          'type': 'static_library',
+          'include_dirs': [
+            '..',
+          ],
+          'dependencies': [
+            # List of dependencies is intentionally very minimal. Please avoid
+            # adding extra dependencies without first checking with OWNERS.
+            '../base/base.gyp:base_win64',
+          ],
+          'sources': [
+            'crash/core/common/crash_keys.cc',
+            'crash/core/common/crash_keys.h',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+        },
+      ],
+    }],
     ['OS!="ios"', {
       'targets': [
         {
diff --git a/components/crash/DEPS b/components/crash/content/DEPS
index 9ebc497..9ebc497 100644
--- a/components/crash/DEPS
+++ b/components/crash/content/DEPS
diff --git a/components/crash_keys/DEPS b/components/crash/core/DEPS
index 9b9a615..956881c 100644
--- a/components/crash_keys/DEPS
+++ b/components/crash/core/DEPS
@@ -2,6 +2,6 @@
 # dependencies to a minimal set.
 include_rules = [
   "-components",
-  "+components/crash_keys",
+  "+components/crash/core",
   "-net",
 ]
diff --git a/components/crash_keys/OWNERS b/components/crash/core/OWNERS
index 14fce2a..14fce2a 100644
--- a/components/crash_keys/OWNERS
+++ b/components/crash/core/OWNERS
diff --git a/components/crash/core/common/BUILD.gn b/components/crash/core/common/BUILD.gn
new file mode 100644
index 0000000..d404cfe
--- /dev/null
+++ b/components/crash/core/common/BUILD.gn
@@ -0,0 +1,34 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("common") {
+  sources = [
+    "crash_keys.cc",
+    "crash_keys.h",
+  ]
+
+  deps = [
+    "//base",
+  ]
+
+  if (is_mac || is_ios) {
+    sources += [
+      "objc_zombie.h",
+      "objc_zombie.mm",
+    ]
+  }
+}
+
+source_set("unit_tests") {
+  if (is_mac || is_ios) {
+    sources = [
+      "objc_zombie_unittest.mm",
+    ]
+    deps = [
+      "//base",
+      "//testing/gtest",
+      ":common",
+    ]
+  }
+}
diff --git a/components/crash_keys/crash_keys.cc b/components/crash/core/common/crash_keys.cc
index f8c0a3f..c0afc6a 100644
--- a/components/crash_keys/crash_keys.cc
+++ b/components/crash/core/common/crash_keys.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/crash_keys/crash_keys.h"
+#include "components/crash/core/common/crash_keys.h"
 
 #include "base/debug/crash_logging.h"
 #include "base/format_macros.h"
diff --git a/components/crash_keys/crash_keys.h b/components/crash/core/common/crash_keys.h
index e427778..4b1f768 100644
--- a/components/crash_keys/crash_keys.h
+++ b/components/crash/core/common/crash_keys.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_CRASH_KEYS_CRASH_KEYS_H_
-#define COMPONENTS_CRASH_KEYS_CRASH_KEYS_H_
+#ifndef COMPONENTS_CRASH_CORE_COMMON_CRASH_KEYS_H_
+#define COMPONENTS_CRASH_CORE_COMMON_CRASH_KEYS_H_
 
 #include <string>
 #include <vector>
@@ -74,4 +74,4 @@ extern const char kZombieTrace[];
 
 }  // namespace crash_keys
 
-#endif  // COMPONENTS_CRASH_KEYS_CRASH_KEYS_H_
+#endif  // COMPONENTS_CRASH_CORE_COMMON_CRASH_KEYS_H_
diff --git a/chrome/common/mac/objc_zombie.h b/components/crash/core/common/objc_zombie.h
index 1cfae56..88fe0aa 100644
--- a/chrome/common/mac/objc_zombie.h
+++ b/components/crash/core/common/objc_zombie.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_MAC_OBJC_ZOMBIE_H_
-#define CHROME_COMMON_MAC_OBJC_ZOMBIE_H_
+#ifndef COMPONENTS_CRASH_CORE_COMMON_OBJC_ZOMBIE_H_
+#define COMPONENTS_CRASH_CORE_COMMON_OBJC_ZOMBIE_H_
 
 #include "base/basictypes.h"
 
@@ -43,4 +43,4 @@ void ZombieDisable();
 #endif  // __OBJC__
 #endif  // OS_MACOSX
 
-#endif  // CHROME_COMMON_MAC_OBJC_ZOMBIE_H_
+#endif  // COMPONENTS_CRASH_CORE_COMMON_OBJC_ZOMBIE_H_
diff --git a/chrome/common/mac/objc_zombie.mm b/components/crash/core/common/objc_zombie.mm
index 720b124..5404032 100644
--- a/chrome/common/mac/objc_zombie.mm
+++ b/components/crash/core/common/objc_zombie.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/common/mac/objc_zombie.h"
+#import "components/crash/core/common/objc_zombie.h"
 
 #include <AvailabilityMacros.h>
 
@@ -18,7 +18,7 @@
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
-#include "components/crash_keys/crash_keys.h"
+#include "components/crash/core/common/crash_keys.h"
 
 #if !defined(OS_IOS) && (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_6)
 // Apparently objc/runtime.h doesn't define this with the 10.6 SDK yet.
diff --git a/chrome/common/mac/objc_zombie_unittest.mm b/components/crash/core/common/objc_zombie_unittest.mm
index 9e438d2..812cff8 100644
--- a/chrome/common/mac/objc_zombie_unittest.mm
+++ b/components/crash/core/common/objc_zombie_unittest.mm
@@ -7,7 +7,7 @@
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
-#import "chrome/common/mac/objc_zombie.h"
+#import "components/crash/core/common/objc_zombie.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/components/crash_keys.gypi b/components/crash_keys.gypi
deleted file mode 100644
index 6551551..0000000
--- a/components/crash_keys.gypi
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'targets': [
-    {
-      # GN version: //components/crash_keys
-      'target_name': 'crash_keys',
-      'type': 'static_library',
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies': [
-        # List of dependencies is intentionally very minimal. Please avoid
-        # adding extra dependencies without first checking with OWNERS.
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'crash_keys/crash_keys.cc',
-        'crash_keys/crash_keys.h',
-      ],
-    },
-  ],
-  'conditions': [
-    ['OS=="win" and target_arch=="ia32"', {
-      'targets': [
-        {
-          'target_name': 'crash_keys_win64',
-          'type': 'static_library',
-          'sources': [
-            'crash_keys/crash_keys.cc',
-            'crash_keys/crash_keys.h',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base_win64',
-          ],
-          'configurations': {
-            'Common_Base': {
-              'msvs_target_platform': 'x64',
-            },
-          },
-        },
-      ],
-    }],
-  ],
-}
diff --git a/components/crash_keys/BUILD.gn b/components/crash_keys/BUILD.gn
deleted file mode 100644
index d15cd18..0000000
--- a/components/crash_keys/BUILD.gn
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("crash_keys") {
-  sources = [
-    "crash_keys.cc",
-    "crash_keys.h",
-  ]
-
-  deps = [
-    "//base",
-  ]
-}
diff --git a/components/omnibox.gypi b/components/omnibox.gypi
index 1c5d027..0dfb932 100644
--- a/components/omnibox.gypi
+++ b/components/omnibox.gypi
@@ -19,7 +19,7 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../url/url.gyp:url_lib',
         'bookmarks_browser',
-        'crash_keys',  # TODO(mpearson): remove once 464926 is fixed.
+        'crash_core_common',  # TODO(mpearson): remove once 464926 is fixed.
         'metrics',
         'component_metrics_proto',
         'components_resources.gyp:components_resources',
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index 59ea020..2132032 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -107,7 +107,7 @@ source_set("browser") {
     "//base:i18n",
     "//base:prefs",
     "//components/bookmarks/browser",
-    "//components/crash_keys",  # TODO(mpearson): remove once 464926 is fixed.
+    "//components/crash/core/common",  # TODO(mpearson): remove once 464926 is fixed.
     "//components/data_use_measurement/core",
     "//components/keyed_service/core",
     "//components/metrics",
diff --git a/components/omnibox/browser/DEPS b/components/omnibox/browser/DEPS
index 573394e2..37dae37 100644
--- a/components/omnibox/browser/DEPS
+++ b/components/omnibox/browser/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+components/bookmarks/browser",
-  "+components/crash_keys",  # TODO(mpearson): remove once 464926 is fixed.
+  "+components/crash/core/common",  # TODO(mpearson): remove once 464926 is fixed.
   "+components/data_use_measurement/core",
   "+components/history/core/browser",
   "+components/keyed_service/core",
diff --git a/components/omnibox/browser/history_quick_provider.cc b/components/omnibox/browser/history_quick_provider.cc
index 8eb8984..4975b72 100644
--- a/components/omnibox/browser/history_quick_provider.cc
+++ b/components/omnibox/browser/history_quick_provider.cc
@@ -16,7 +16,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/bookmarks/browser/bookmark_model.h"
-#include "components/crash_keys/crash_keys.h"
+#include "components/crash/core/common/crash_keys.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
@@ -236,8 +236,8 @@ AutocompleteMatch HistoryQuickProvider::QuickMatchToACMatch(
   // Set |inline_autocompletion| and |allowed_to_be_default_match| if possible.
   if (history_match.can_inline) {
     // TODO(mpearson): remove this and all dependency of //components/omnibox
-    // on //components/crash_keys once http://crbug.com/464926 is fixed (i.e.
-    // remove #include, exception in components/omnibox/DEPS, and dependency
+    // on //components/crash/core/common once http://crbug.com/464926 is fixed
+    // (i.e. remove #include, exception in components/omnibox/DEPS, and deps
     // in components/omnibox.gypi and components/omnibox/browser/BUILD.gn).
     base::debug::ScopedCrashKey crash_info(
         crash_keys::kBug464926CrashKey,
diff --git a/components/variations.gypi b/components/variations.gypi
index 562bcbb..f584868 100644
--- a/components/variations.gypi
+++ b/components/variations.gypi
@@ -20,7 +20,7 @@
         '../third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'compression',
-        'crash_keys',
+        'crash_core_common',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
diff --git a/components/variations/BUILD.gn b/components/variations/BUILD.gn
index c0e4b45..7908526 100644
--- a/components/variations/BUILD.gn
+++ b/components/variations/BUILD.gn
@@ -64,7 +64,7 @@ source_set("variations") {
     "//base",
     "//base:prefs",
     "//components/compression",
-    "//components/crash_keys",
+    "//components/crash/core/common",
     "//crypto",
     "//third_party/mt19937ar",
     "//third_party/protobuf:protobuf_lite",
diff --git a/components/variations/DEPS b/components/variations/DEPS
index 76275a7..74cc51a 100644
--- a/components/variations/DEPS
+++ b/components/variations/DEPS
@@ -3,7 +3,7 @@
 include_rules = [
   "-components",
   "+components/compression",
-  "+components/crash_keys",
+  "+components/crash/core/common",
   "+components/variations",
   "+crypto",
   "-net",
diff --git a/components/variations/variations_util.cc b/components/variations/variations_util.cc
index 8d4a1a4..b5116d1 100644
--- a/components/variations/variations_util.cc
+++ b/components/variations/variations_util.cc
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "components/crash_keys/crash_keys.h"
+#include "components/crash/core/common/crash_keys.h"
 #include "components/variations/active_field_trials.h"
 
 namespace variations {
diff --git a/ios/chrome/browser/DEPS b/ios/chrome/browser/DEPS
index 97dcade..36312ce 100644
--- a/ios/chrome/browser/DEPS
+++ b/ios/chrome/browser/DEPS
@@ -9,7 +9,7 @@ include_rules = [
   "+components/bookmarks",
   "+components/component_updater",
   "+components/content_settings/core",
-  "+components/crash_keys",
+  "+components/crash/core/common",
   "+components/data_reduction_proxy/core/browser",
   "+components/data_reduction_proxy/core/common",
   "+components/dom_distiller/core",
diff --git a/ios/chrome/browser/crash_report/crash_keys.cc b/ios/chrome/browser/crash_report/crash_keys.cc
index 9686c41..c1c939d 100644
--- a/ios/chrome/browser/crash_report/crash_keys.cc
+++ b/ios/chrome/browser/crash_report/crash_keys.cc
@@ -7,7 +7,7 @@
 #include "base/debug/crash_logging.h"
 #include "base/macros.h"
 #include "breakpad/src/common/simple_string_dictionary.h"
-#include "components/crash_keys/crash_keys.h"
+#include "components/crash/core/common/crash_keys.h"
 
 namespace {
 
diff --git a/ios/chrome/browser/metrics/field_trial_synchronizer.cc b/ios/chrome/browser/metrics/field_trial_synchronizer.cc
index ca7fc10..306b47d 100644
--- a/ios/chrome/browser/metrics/field_trial_synchronizer.cc
+++ b/ios/chrome/browser/metrics/field_trial_synchronizer.cc
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "components/crash_keys/crash_keys.h"
+#include "components/crash/core/common/crash_keys.h"
 #include "components/variations/active_field_trials.h"
 
 namespace ios {
diff --git a/ios/chrome/ios_chrome.gyp b/ios/chrome/ios_chrome.gyp
index 2a8922b8..19d51cf 100644
--- a/ios/chrome/ios_chrome.gyp
+++ b/ios/chrome/ios_chrome.gyp
@@ -51,7 +51,7 @@
         '../../components/components.gyp:bookmarks_managed',
         '../../components/components.gyp:component_updater',
         '../../components/components.gyp:content_settings_core_browser',
-        '../../components/components.gyp:crash_keys',
+        '../../components/components.gyp:crash_core_common',
         '../../components/components.gyp:data_reduction_proxy_core_common',
         '../../components/components.gyp:dom_distiller_core',
         '../../components/components.gyp:dom_distiller_ios',