Move the CrashKeysWin class to a pair of files as first step.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 23de5ed412c2ab07ac85e295a4de5c4a6722c38e..f8dcea39db36b9bd1d8a4f26bc4dbd51867003a5 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -67,7 +67,7 @@
             'bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc',
             'bookmarks/browser/bookmark_index_unittest.cc',
             'bookmarks/browser/bookmark_model_unittest.cc',
-            'bookmarks/browser/bookmark_utils_unittest.cc',

[Robert Sesek, 2014/06/10 21:14:14]

Intentional?

[Sigurður Ásgeirsson, 2014/06/11 13:19:39]

Ooops - merge messup. Thanks!

+            'breakpad/app/crash_keys_win_unittest.cc',
             'captive_portal/captive_portal_detector_unittest.cc',
             'cloud_devices/common/cloud_devices_urls_unittest.cc',
             'cloud_devices/common/printer_description_unittest.cc',
@@ -224,6 +224,9 @@
             'components_strings.gyp:components_strings',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
 
+            # Dependencies of breakpad
+            'components.gyp:breakpad_test_support',
+
             # Dependencies of bookmarks
             'components.gyp:bookmarks_browser',
             'components.gyp:bookmarks_test_support',
@@ -254,7 +257,7 @@
 
             # Dependencies of feedback
             'components.gyp:feedback_component',
-            
+
             # Dependencies of gcm
             'components.gyp:gcm_driver',
             'components.gyp:gcm_driver_test_support',