Move the crash metrics to the crash reproting lib to avoid a back dependency on Chrome Frame.

BUG=0
TEST=none

Review URL: http://codereview.chromium.org/2776010

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

9 files changed, 11 insertions, 11 deletions

diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc
index 3033b9a..afa191d 100644
--- a/chrome_frame/bho.cc
+++ b/chrome_frame/bho.cc
@@ -14,7 +14,7 @@
 #include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "chrome_tab.h" // NOLINT
-#include "chrome_frame/crash_metrics.h"
+#include "chrome_frame/crash_reporting/crash_metrics.h"
 #include "chrome_frame/extra_system_apis.h"
 #include "chrome_frame/http_negotiate.h"
 #include "chrome_frame/metrics_service.h"
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 70b1656..3223edd 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -38,7 +38,7 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/bind_context_info.h"
-#include "chrome_frame/crash_metrics.h"
+#include "chrome_frame/crash_reporting/crash_metrics.h"
 #include "chrome_frame/utils.h"
 
 const wchar_t kChromeAttachExternalTabPrefix[] = L"attach_external_tab";
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 3bb4fa9..607929e 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -621,8 +621,6 @@
         'com_message_event.h',
         'com_type_info_holder.cc',
         'com_type_info_holder.h',
-        'crash_metrics.cc',
-        'crash_metrics.h',
         'delete_chrome_history.cc',
         'delete_chrome_history.h',
         'exception_barrier.cc',
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 9deaeb5..1679758 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -23,8 +23,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/chrome_launcher_utils.h"
+#include "chrome_frame/crash_reporting/crash_metrics.h"
 #include "chrome_frame/custom_sync_call_context.h"
-#include "chrome_frame/crash_metrics.h"
 #include "chrome_frame/utils.h"
 
 #ifdef NDEBUG
diff --git a/chrome_frame/crash_metrics.cc b/chrome_frame/crash_reporting/crash_metrics.cc
index 8b1a97a..81c2296 100644
--- a/chrome_frame/crash_metrics.cc
+++ b/chrome_frame/crash_reporting/crash_metrics.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome_frame/crash_metrics.h"
+#include "chrome_frame/crash_reporting/crash_metrics.h"
 
 #include "base/histogram.h"
 #include "base/registry.h"
diff --git a/chrome_frame/crash_metrics.h b/chrome_frame/crash_reporting/crash_metrics.h
index f0812c6..a51ca7d 100644
--- a/chrome_frame/crash_metrics.h
+++ b/chrome_frame/crash_reporting/crash_metrics.h
@@ -5,8 +5,8 @@
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
-#ifndef CHROME_FRAME_CRASH_METRICS_H_
-#define CHROME_FRAME_CRASH_METRICS_H_
+#ifndef CHROME_FRAME_CRASH_REPORTING_CRASH_METRICS_H_
+#define CHROME_FRAME_CRASH_REPORTING_CRASH_METRICS_H_
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
@@ -61,5 +61,5 @@ class CrashMetricsReporter {
   DISALLOW_COPY_AND_ASSIGN(CrashMetricsReporter);
 };
 
-#endif  // CHROME_FRAME_CRASH_METRICS_H_
+#endif  // CHROME_FRAME_CRASH_REPORTING_CRASH_METRICS_H_
 
diff --git a/chrome_frame/crash_reporting/crash_report.cc b/chrome_frame/crash_reporting/crash_report.cc
index f821320..e71bd66 100644
--- a/chrome_frame/crash_reporting/crash_report.cc
+++ b/chrome_frame/crash_reporting/crash_report.cc
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
-#include "chrome_frame/crash_metrics.h"
+#include "chrome_frame/crash_reporting/crash_metrics.h"
 
 // TODO(joshia): factor out common code with chrome used for crash reporting
 const wchar_t kGoogleUpdatePipeName[] = L"\\\\.\\pipe\\GoogleCrashServices\\";
diff --git a/chrome_frame/crash_reporting/crash_reporting.gyp b/chrome_frame/crash_reporting/crash_reporting.gyp
index 54473fc..63a16e6 100644
--- a/chrome_frame/crash_reporting/crash_reporting.gyp
+++ b/chrome_frame/crash_reporting/crash_reporting.gyp
@@ -17,6 +17,8 @@
       'target_name': 'crash_report',
       'type': 'static_library',
       'sources': [
+        'crash_metrics.cc',
+        'crash_metrics.h',
         'crash_report.cc',
         'crash_report.h',
         'nt_loader.cc',
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index 57fdf6e..85bb0b3 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -58,7 +58,7 @@
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome_frame/bind_status_callback_impl.h"
-#include "chrome_frame/crash_metrics.h"
+#include "chrome_frame/crash_reporting/crash_metrics.h"
 #include "chrome_frame/utils.h"
 #include "net/base/upload_data.h"
 #include "chrome_frame/urlmon_bind_status_callback.h"