diff options
Diffstat (limited to 'components/metrics')
13 files changed, 34 insertions, 34 deletions
diff --git a/components/metrics/daily_event_unittest.cc b/components/metrics/daily_event_unittest.cc index 4253c13..a43b60b 100644 --- a/components/metrics/daily_event_unittest.cc +++ b/components/metrics/daily_event_unittest.cc @@ -20,7 +20,7 @@ class TestDailyObserver : public DailyEvent::Observer { bool fired() const { return fired_; } - virtual void OnDailyEvent() OVERRIDE { + virtual void OnDailyEvent() override { fired_ = true; } diff --git a/components/metrics/gpu/gpu_metrics_provider.h b/components/metrics/gpu/gpu_metrics_provider.h index d10db56..810ef6e 100644 --- a/components/metrics/gpu/gpu_metrics_provider.h +++ b/components/metrics/gpu/gpu_metrics_provider.h @@ -19,7 +19,7 @@ class GPUMetricsProvider : public MetricsProvider { // MetricsProvider: virtual void ProvideSystemProfileMetrics( - SystemProfileProto* system_profile_proto) OVERRIDE; + SystemProfileProto* system_profile_proto) override; protected: // Exposed for the sake of mocking in test code. diff --git a/components/metrics/gpu/gpu_metrics_provider_unittest.cc b/components/metrics/gpu/gpu_metrics_provider_unittest.cc index 1aea17a..c7eb31b 100644 --- a/components/metrics/gpu/gpu_metrics_provider_unittest.cc +++ b/components/metrics/gpu/gpu_metrics_provider_unittest.cc @@ -24,15 +24,15 @@ class TestGPUMetricsProvider : public GPUMetricsProvider { virtual ~TestGPUMetricsProvider() {} private: - virtual gfx::Size GetScreenSize() const OVERRIDE { + virtual gfx::Size GetScreenSize() const override { return gfx::Size(kScreenWidth, kScreenHeight); } - virtual float GetScreenDeviceScaleFactor() const OVERRIDE { + virtual float GetScreenDeviceScaleFactor() const override { return kScreenScaleFactor; } - virtual int GetScreenCount() const OVERRIDE { + virtual int GetScreenCount() const override { return kScreenCount; } diff --git a/components/metrics/metrics_log_unittest.cc b/components/metrics/metrics_log_unittest.cc index 7dcbfcd..eb85227 100644 --- a/components/metrics/metrics_log_unittest.cc +++ b/components/metrics/metrics_log_unittest.cc @@ -71,7 +71,7 @@ class TestMetricsLog : public MetricsLog { virtual void GetFieldTrialIds( std::vector<variations::ActiveGroupId>* field_trial_ids) const - OVERRIDE { + override { ASSERT_TRUE(field_trial_ids->empty()); for (size_t i = 0; i < arraysize(kFieldTrialIds); ++i) { diff --git a/components/metrics/metrics_service.h b/components/metrics/metrics_service.h index fab5698..c332c8a 100644 --- a/components/metrics/metrics_service.h +++ b/components/metrics/metrics_service.h @@ -153,12 +153,12 @@ class MetricsService : public base::HistogramFlattener { // HistogramFlattener: virtual void RecordDelta(const base::HistogramBase& histogram, - const base::HistogramSamples& snapshot) OVERRIDE; + const base::HistogramSamples& snapshot) override; virtual void InconsistencyDetected( - base::HistogramBase::Inconsistency problem) OVERRIDE; + base::HistogramBase::Inconsistency problem) override; virtual void UniqueInconsistencyDetected( - base::HistogramBase::Inconsistency problem) OVERRIDE; - virtual void InconsistencyDetectedInLoggedCount(int amount) OVERRIDE; + base::HistogramBase::Inconsistency problem) override; + virtual void InconsistencyDetectedInLoggedCount(int amount) override; // This should be called when the application is not idle, i.e. the user seems // to be interacting with the application. diff --git a/components/metrics/metrics_service_unittest.cc b/components/metrics/metrics_service_unittest.cc index 3e4f504..8bfbd54 100644 --- a/components/metrics/metrics_service_unittest.cc +++ b/components/metrics/metrics_service_unittest.cc @@ -38,9 +38,9 @@ class TestMetricsProvider : public metrics::MetricsProvider { provide_stability_metrics_called_(false) { } - virtual bool HasStabilityMetrics() OVERRIDE { return has_stability_metrics_; } + virtual bool HasStabilityMetrics() override { return has_stability_metrics_; } virtual void ProvideStabilityMetrics( - SystemProfileProto* system_profile_proto) OVERRIDE { + SystemProfileProto* system_profile_proto) override { provide_stability_metrics_called_ = true; } diff --git a/components/metrics/net/net_metrics_log_uploader.h b/components/metrics/net/net_metrics_log_uploader.h index 52ee753..e011430 100644 --- a/components/metrics/net/net_metrics_log_uploader.h +++ b/components/metrics/net/net_metrics_log_uploader.h @@ -34,11 +34,11 @@ class NetMetricsLogUploader : public MetricsLogUploader, // MetricsLogUploader: virtual bool UploadLog(const std::string& compressed_log_data, - const std::string& log_hash) OVERRIDE; + const std::string& log_hash) override; private: // net::URLFetcherDelegate: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // The request context for fetches done using the network stack. net::URLRequestContextGetter* const request_context_getter_; diff --git a/components/metrics/net/network_metrics_provider.h b/components/metrics/net/network_metrics_provider.h index 29f0ed7..2d03544 100644 --- a/components/metrics/net/network_metrics_provider.h +++ b/components/metrics/net/network_metrics_provider.h @@ -27,13 +27,13 @@ class NetworkMetricsProvider private: // metrics::MetricsProvider: - virtual void OnDidCreateMetricsLog() OVERRIDE; + virtual void OnDidCreateMetricsLog() override; virtual void ProvideSystemProfileMetrics( - metrics::SystemProfileProto* system_profile) OVERRIDE; + metrics::SystemProfileProto* system_profile) override; // ConnectionTypeObserver: virtual void OnConnectionTypeChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; metrics::SystemProfileProto::Network::ConnectionType GetConnectionType() const; diff --git a/components/metrics/net/wifi_access_point_info_provider_chromeos.h b/components/metrics/net/wifi_access_point_info_provider_chromeos.h index 6eaebab..520cedd 100644 --- a/components/metrics/net/wifi_access_point_info_provider_chromeos.h +++ b/components/metrics/net/wifi_access_point_info_provider_chromeos.h @@ -22,11 +22,11 @@ class WifiAccessPointInfoProviderChromeos virtual ~WifiAccessPointInfoProviderChromeos(); // WifiAccessPointInfoProvider - virtual bool GetInfo(WifiAccessPointInfo* info) OVERRIDE; + virtual bool GetInfo(WifiAccessPointInfo* info) override; // NetworkStateHandlerObserver overrides. virtual void DefaultNetworkChanged( - const chromeos::NetworkState* default_network) OVERRIDE; + const chromeos::NetworkState* default_network) override; private: // Callback from Shill.Service.GetProperties. Parses |properties| to obtain diff --git a/components/metrics/profiler/profiler_metrics_provider.h b/components/metrics/profiler/profiler_metrics_provider.h index f9e7e48..d8bdff3 100644 --- a/components/metrics/profiler/profiler_metrics_provider.h +++ b/components/metrics/profiler/profiler_metrics_provider.h @@ -24,7 +24,7 @@ class ProfilerMetricsProvider : public MetricsProvider { // MetricsDataProvider: virtual void ProvideGeneralMetrics( - ChromeUserMetricsExtension* uma_proto) OVERRIDE; + ChromeUserMetricsExtension* uma_proto) override; // Records the passed profiled data, which should be a snapshot of the // browser's profiled performance during startup for a single process. diff --git a/components/metrics/profiler/tracking_synchronizer.h b/components/metrics/profiler/tracking_synchronizer.h index 75f1f33..2bc08e7 100644 --- a/components/metrics/profiler/tracking_synchronizer.h +++ b/components/metrics/profiler/tracking_synchronizer.h @@ -59,7 +59,7 @@ class TrackingSynchronizer // This is called on UI thread. virtual void OnPendingProcesses(int sequence_number, int pending_processes, - bool end) OVERRIDE; + bool end) override; private: friend class base::RefCountedThreadSafe<TrackingSynchronizer>; @@ -75,7 +75,7 @@ class TrackingSynchronizer virtual void OnProfilerDataCollected( int sequence_number, const tracked_objects::ProcessDataSnapshot& profiler_data, - int process_type) OVERRIDE; + int process_type) override; // Establish a new sequence_number_, and use it to notify all the processes of // the need to supply, to the browser, their tracking data. It also registers diff --git a/components/metrics/serialization/serialization_utils_unittest.cc b/components/metrics/serialization/serialization_utils_unittest.cc index e8f0e14..aa1c724 100644 --- a/components/metrics/serialization/serialization_utils_unittest.cc +++ b/components/metrics/serialization/serialization_utils_unittest.cc @@ -25,7 +25,7 @@ class SerializationUtilsTest : public testing::Test { } } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { base::DeleteFile(filepath, false); } diff --git a/components/metrics/test_metrics_service_client.h b/components/metrics/test_metrics_service_client.h index 43600df..8565ca9 100644 --- a/components/metrics/test_metrics_service_client.h +++ b/components/metrics/test_metrics_service_client.h @@ -21,22 +21,22 @@ class TestMetricsServiceClient : public MetricsServiceClient { virtual ~TestMetricsServiceClient(); // MetricsServiceClient: - virtual void SetMetricsClientId(const std::string& client_id) OVERRIDE; - virtual bool IsOffTheRecordSessionActive() OVERRIDE; - virtual int32_t GetProduct() OVERRIDE; - virtual std::string GetApplicationLocale() OVERRIDE; - virtual bool GetBrand(std::string* brand_code) OVERRIDE; - virtual SystemProfileProto::Channel GetChannel() OVERRIDE; - virtual std::string GetVersionString() OVERRIDE; - virtual void OnLogUploadComplete() OVERRIDE; + virtual void SetMetricsClientId(const std::string& client_id) override; + virtual bool IsOffTheRecordSessionActive() override; + virtual int32_t GetProduct() override; + virtual std::string GetApplicationLocale() override; + virtual bool GetBrand(std::string* brand_code) override; + virtual SystemProfileProto::Channel GetChannel() override; + virtual std::string GetVersionString() override; + virtual void OnLogUploadComplete() override; virtual void StartGatheringMetrics( - const base::Closure& done_callback) OVERRIDE; + const base::Closure& done_callback) override; virtual void CollectFinalMetrics(const base::Closure& done_callback) - OVERRIDE; + override; virtual scoped_ptr<MetricsLogUploader> CreateUploader( const std::string& server_url, const std::string& mime_type, - const base::Callback<void(int)>& on_upload_complete) OVERRIDE; + const base::Callback<void(int)>& on_upload_complete) override; const std::string& get_client_id() const { return client_id_; } void set_version_string(const std::string& str) { version_string_ = str; } |