diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-24 12:17:33 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-24 12:17:33 +0000 |
| commit | 8304f61a936e26b0be93e5b64dbafced34a528b4 (patch) | |
| tree | dc47d46ffb570cd8e1639dc463acddeb911e4929 /chrome/browser/metrics/metrics_service_unittest.cc | |
| parent | b1d686186448b168955d83a821daaa593faaa51a (diff) | |
| download | chromium_src-8304f61a936e26b0be93e5b64dbafced34a528b4.zip chromium_src-8304f61a936e26b0be93e5b64dbafced34a528b4.tar.gz chromium_src-8304f61a936e26b0be93e5b64dbafced34a528b4.tar.bz2 | |
Refactor MetricsLogChromeOS to ChromeOSMetricsProvider.
Turns MetricsLogChromeOS into a metrics::MetricsProvider. Splits the
ChromeOS-specific unittests out from the MetricsLog test into separate
ChromeOSMetricsProvider tests. Also moves LogChromeOSCrash() from
MetricsService to ChromeOSMetricsProvider.
BUG=374221
R=asvitkine@chromium.org
TBR=derat, pam
Review URL: https://codereview.chromium.org/292433015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/metrics_service_unittest.cc')
| -rw-r--r-- | chrome/browser/metrics/metrics_service_unittest.cc | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/chrome/browser/metrics/metrics_service_unittest.cc b/chrome/browser/metrics/metrics_service_unittest.cc index 5cb53de..f0960bf 100644 --- a/chrome/browser/metrics/metrics_service_unittest.cc +++ b/chrome/browser/metrics/metrics_service_unittest.cc @@ -19,10 +19,6 @@ #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/metrics/metrics_log_chromeos.h" -#endif // OS_CHROMEOS - namespace { using metrics::MetricsLogManager; @@ -40,32 +36,14 @@ class TestMetricsService : public MetricsService { DISALLOW_COPY_AND_ASSIGN(TestMetricsService); }; -#if defined(OS_CHROMEOS) -class TestMetricsLogChromeOS : public MetricsLogChromeOS { - public: - explicit TestMetricsLogChromeOS( - metrics::ChromeUserMetricsExtension* uma_proto) - : MetricsLogChromeOS(uma_proto) { - } - - protected: - // Don't touch bluetooth information, as it won't be correctly initialized. - virtual void WriteBluetoothProto() OVERRIDE { - } -}; -#endif // OS_CHROMEOS - class TestMetricsLog : public MetricsLog { public: TestMetricsLog(const std::string& client_id, int session_id, metrics::MetricsServiceClient* client) : MetricsLog(client_id, session_id, MetricsLog::ONGOING_LOG, client) { -#if defined(OS_CHROMEOS) - metrics_log_chromeos_.reset(new TestMetricsLogChromeOS( - MetricsLog::uma_proto())); -#endif // OS_CHROMEOS } + virtual ~TestMetricsLog() {} private: |