diff options
-rw-r--r-- | chrome/browser/metrics/metrics_service.cc | 4 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 2 | ||||
-rw-r--r-- | chrome/chrome_tests_unit.gypi | 1 | ||||
-rw-r--r-- | components/components_tests.gyp | 1 | ||||
-rw-r--r-- | components/metrics.gypi | 2 | ||||
-rw-r--r-- | components/metrics/metrics_reporting_scheduler.cc (renamed from chrome/browser/metrics/metrics_reporting_scheduler.cc) | 4 | ||||
-rw-r--r-- | components/metrics/metrics_reporting_scheduler.h (renamed from chrome/browser/metrics/metrics_reporting_scheduler.h) | 8 | ||||
-rw-r--r-- | components/metrics/metrics_reporting_scheduler_unittest.cc (renamed from chrome/browser/metrics/metrics_reporting_scheduler_unittest.cc) | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 0c972e3..3d7f171 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -187,11 +187,9 @@ #include "chrome/browser/memory_details.h" #include "chrome/browser/metrics/compression_utils.h" #include "chrome/browser/metrics/metrics_log.h" -#include "chrome/browser/metrics/metrics_reporting_scheduler.h" #include "chrome/browser/metrics/metrics_state_manager.h" #include "chrome/browser/metrics/time_ticks_experiment_win.h" #include "chrome/browser/metrics/tracking_synchronizer.h" -#include "chrome/common/metrics/variations/variations_util.h" #include "chrome/browser/net/http_pipelining_compatibility_client.h" #include "chrome/browser/net/network_stats.h" #include "chrome/browser/omnibox/omnibox_log.h" @@ -199,11 +197,13 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/crash_keys.h" +#include "chrome/common/metrics/variations/variations_util.h" #include "chrome/common/net/test_server_locations.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "components/metrics/metrics_log_manager.h" #include "components/metrics/metrics_pref_names.h" +#include "components/metrics/metrics_reporting_scheduler.h" #include "components/variations/entropy_provider.h" #include "components/variations/metrics_util.h" #include "content/public/browser/child_process_data.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index a2b311b..ac0b5c7 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1206,8 +1206,6 @@ 'browser/metrics/metrics_log_chromeos.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_android.cc', 'browser/metrics/metrics_service.cc', 'browser/metrics/metrics_service.h', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 1f783ca..9cfcdd8 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1079,7 +1079,6 @@ 'browser/metrics/extension_metrics_unittest.cc', 'browser/metrics/machine_id_provider_win_unittest.cc', 'browser/metrics/metrics_log_unittest.cc', - 'browser/metrics/metrics_reporting_scheduler_unittest.cc', 'browser/metrics/metrics_service_unittest.cc', 'browser/metrics/metrics_state_manager_unittest.cc', 'browser/metrics/thread_watcher_unittest.cc', diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 6f2e098..64cf12b 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -107,6 +107,7 @@ 'metrics/metrics_hashes_unittest.cc', 'metrics/metrics_log_base_unittest.cc', 'metrics/metrics_log_manager_unittest.cc', + 'metrics/metrics_reporting_scheduler_unittest.cc', 'metrics/persisted_logs_unittest.cc', 'navigation_interception/intercept_navigation_resource_throttle_unittest.cc', 'os_crypt/ie7_password_win_unittest.cc', diff --git a/components/metrics.gypi b/components/metrics.gypi index f7fdc23..a572cda 100644 --- a/components/metrics.gypi +++ b/components/metrics.gypi @@ -24,6 +24,8 @@ 'metrics/metrics_log_manager.h', 'metrics/metrics_pref_names.cc', 'metrics/metrics_pref_names.h', + 'metrics/metrics_reporting_scheduler.cc', + 'metrics/metrics_reporting_scheduler.h', 'metrics/metrics_service_client.h', 'metrics/metrics_service_observer.cc', 'metrics/metrics_service_observer.h', diff --git a/chrome/browser/metrics/metrics_reporting_scheduler.cc b/components/metrics/metrics_reporting_scheduler.cc index 1069e12..4b67271b2 100644 --- a/chrome/browser/metrics/metrics_reporting_scheduler.cc +++ b/components/metrics/metrics_reporting_scheduler.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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. -#include "chrome/browser/metrics/metrics_reporting_scheduler.h" +#include "components/metrics/metrics_reporting_scheduler.h" #include "base/compiler_specific.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/metrics/metrics_reporting_scheduler.h b/components/metrics/metrics_reporting_scheduler.h index 6e1d108..7cdfad8 100644 --- a/chrome/browser/metrics/metrics_reporting_scheduler.h +++ b/components/metrics/metrics_reporting_scheduler.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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. -#ifndef CHROME_BROWSER_METRICS_METRICS_REPORTING_SCHEDULER_H_ -#define CHROME_BROWSER_METRICS_METRICS_REPORTING_SCHEDULER_H_ +#ifndef COMPONENTS_METRICS_METRICS_REPORTING_SCHEDULER_H_ +#define COMPONENTS_METRICS_METRICS_REPORTING_SCHEDULER_H_ #include "base/basictypes.h" #include "base/callback.h" @@ -75,4 +75,4 @@ class MetricsReportingScheduler { DISALLOW_COPY_AND_ASSIGN(MetricsReportingScheduler); }; -#endif // CHROME_BROWSER_METRICS_METRICS_REPORTING_SCHEDULER_H_ +#endif // COMPONENTS_METRICS_METRICS_REPORTING_SCHEDULER_H_ diff --git a/chrome/browser/metrics/metrics_reporting_scheduler_unittest.cc b/components/metrics/metrics_reporting_scheduler_unittest.cc index 487ceeb..f7a3d081 100644 --- a/chrome/browser/metrics/metrics_reporting_scheduler_unittest.cc +++ b/components/metrics/metrics_reporting_scheduler_unittest.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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. -#include "chrome/browser/metrics/metrics_reporting_scheduler.h" +#include "components/metrics/metrics_reporting_scheduler.h" #include "base/basictypes.h" #include "base/bind.h" |