Rename IOS- to MobileSessionShutdownMetricsProvider

The name was too general.

BUG=538547
R=sdefresne@chromium.org

Review URL: https://codereview.chromium.org/1644543003

Cr-Commit-Position: refs/heads/master@{#372343}

8 files changed, 62 insertions, 66 deletions

diff --git a/ios/chrome/BUILD.gn b/ios/chrome/BUILD.gn
index b651982..1f7355f 100644
--- a/ios/chrome/BUILD.gn
+++ b/ios/chrome/BUILD.gn
@@ -17,7 +17,7 @@ test("ios_chrome_unittests") {
     "browser/installation_notifier_unittest.mm",
     "browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc",
     "browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc",
-    "browser/metrics/ios_stability_metrics_provider_unittest.mm",
+    "browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm",
     "browser/metrics/previous_session_info_unittest.mm",
     "browser/net/cookie_util_unittest.mm",
     "browser/net/image_fetcher_unittest.mm",
diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn
index 86ce135..8c46774 100644
--- a/ios/chrome/browser/BUILD.gn
+++ b/ios/chrome/browser/BUILD.gn
@@ -223,8 +223,8 @@ source_set("browser") {
     "metrics/ios_chrome_metrics_services_manager_client.h",
     "metrics/ios_chrome_stability_metrics_provider.cc",
     "metrics/ios_chrome_stability_metrics_provider.h",
-    "metrics/ios_stability_metrics_provider.h",
-    "metrics/ios_stability_metrics_provider.mm",
+    "metrics/mobile_session_shutdown_metrics_provider.h",
+    "metrics/mobile_session_shutdown_metrics_provider.mm",
     "metrics/previous_session_info.h",
     "metrics/previous_session_info.mm",
     "net/chrome_cookie_store_ios_client.h",
diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc
index c904249..49fb58a 100644
--- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc
+++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc
@@ -42,7 +42,7 @@
 #include "ios/chrome/browser/chrome_paths.h"
 #include "ios/chrome/browser/google/google_brand.h"
 #include "ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h"
-#include "ios/chrome/browser/metrics/ios_stability_metrics_provider.h"
+#include "ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.h"
 #include "ios/chrome/browser/signin/ios_chrome_signin_status_metrics_provider_delegate.h"
 #include "ios/chrome/browser/tab_parenting_global_observer.h"
 #include "ios/chrome/browser/ui/browser_otr_state.h"
@@ -251,14 +251,9 @@ void IOSChromeMetricsServiceClient::Initialize() {
           SigninStatusMetricsProvider::CreateInstance(make_scoped_ptr(
               new IOSChromeSigninStatusMetricsProviderDelegate))));
 
-  scoped_ptr<metrics::MetricsProvider> ios_stability_metrics_provider(
-      new IOSStabilityMetricsProvider(metrics_service_.get()));
-  if (ios_stability_metrics_provider) {
-    metrics_service_->RegisterMetricsProvider(
-        std::move(ios_stability_metrics_provider));
-  } else {
-    NOTREACHED() << "No IOSStabilityMetricsProvider registered.";
-  }
+  metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(
+          new MobileSessionShutdownMetricsProvider(metrics_service_.get())));
 }
 
 void IOSChromeMetricsServiceClient::OnInitTaskGotDriveMetrics() {
diff --git a/ios/chrome/browser/metrics/ios_stability_metrics_provider.h b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.h
index 19f1d21..18c9f4c 100644
--- a/ios/chrome/browser/metrics/ios_stability_metrics_provider.h
+++ b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_METRICS_IOS_STABILITY_METRICS_PROVIDER_H_
-#define IOS_CHROME_BROWSER_METRICS_IOS_STABILITY_METRICS_PROVIDER_H_
+#ifndef IOS_CHROME_BROWSER_METRICS_MOBILE_SESSION_SHUTDOWN_METRICS_PROVIDER_H_
+#define IOS_CHROME_BROWSER_METRICS_MOBILE_SESSION_SHUTDOWN_METRICS_PROVIDER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -25,12 +25,11 @@ enum MobileSessionShutdownType {
   MOBILE_SESSION_SHUTDOWN_TYPE_COUNT,
 };
 
-// TODO(crbug.com/538547): Rename this class to something more specific.
-class IOSStabilityMetricsProvider : public metrics::MetricsProvider {
+class MobileSessionShutdownMetricsProvider : public metrics::MetricsProvider {
  public:
-  explicit IOSStabilityMetricsProvider(
+  explicit MobileSessionShutdownMetricsProvider(
       metrics::MetricsService* metrics_service);
-  ~IOSStabilityMetricsProvider() override;
+  ~MobileSessionShutdownMetricsProvider() override;
 
   // metrics::MetricsProvider
   bool HasInitialStabilityMetrics() override;
@@ -58,7 +57,7 @@ class IOSStabilityMetricsProvider : public metrics::MetricsProvider {
 
  private:
   metrics::MetricsService* metrics_service_;
-  DISALLOW_COPY_AND_ASSIGN(IOSStabilityMetricsProvider);
+  DISALLOW_COPY_AND_ASSIGN(MobileSessionShutdownMetricsProvider);
 };
 
-#endif  // IOS_CHROME_BROWSER_METRICS_IOS_STABILITY_METRICS_PROVIDER_H_
+#endif  // IOS_CHROME_BROWSER_METRICS_MOBILE_SESSION_SHUTDOWN_METRICS_PROVIDER_H_
diff --git a/ios/chrome/browser/metrics/ios_stability_metrics_provider.mm b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.mm
index cc1af0b..f13237b 100644
--- a/ios/chrome/browser/metrics/ios_stability_metrics_provider.mm
+++ b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.mm
@@ -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 "ios/chrome/browser/metrics/ios_stability_metrics_provider.h"
+#include "ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.h"
 
 #include <Foundation/Foundation.h>
 
@@ -23,31 +23,30 @@ void LogShutdownType(MobileSessionShutdownType type) {
 
 }  // namespace
 
-IOSStabilityMetricsProvider::IOSStabilityMetricsProvider(
+MobileSessionShutdownMetricsProvider::MobileSessionShutdownMetricsProvider(
     metrics::MetricsService* metrics_service)
     : metrics_service_(metrics_service) {
   DCHECK(metrics_service_);
 }
 
-IOSStabilityMetricsProvider::~IOSStabilityMetricsProvider() {
-}
+MobileSessionShutdownMetricsProvider::~MobileSessionShutdownMetricsProvider() {}
 
-bool IOSStabilityMetricsProvider::HasInitialStabilityMetrics() {
+bool MobileSessionShutdownMetricsProvider::HasInitialStabilityMetrics() {
   return true;
 }
 
-void IOSStabilityMetricsProvider::ProvideInitialStabilityMetrics(
+void MobileSessionShutdownMetricsProvider::ProvideInitialStabilityMetrics(
     metrics::SystemProfileProto* system_profile_proto) {
-  // If this is the first launch after an upgrade, existing crash reports
-  // may have been deleted before this code runs, so log this case in its
-  // own bucket.
+  // If this is the first launch after an upgrade, existing crash reports may
+  // have been deleted before this code runs, so log this case in its own
+  // bucket.
   if (IsFirstLaunchAfterUpgrade()) {
     LogShutdownType(FIRST_LAUNCH_AFTER_UPGRADE);
     return;
   }
 
-  // If the last app lifetime did not end with a crash, then log it as a
-  // normal shutdown while in the background.
+  // If the last app lifetime did not end with a crash, then log it as a normal
+  // shutdown while in the background.
   if (metrics_service_->WasLastShutdownClean()) {
     LogShutdownType(SHUTDOWN_IN_BACKGROUND);
     return;
@@ -73,19 +72,21 @@ void IOSStabilityMetricsProvider::ProvideInitialStabilityMetrics(
   LogShutdownType(shutdown_type);
 }
 
-bool IOSStabilityMetricsProvider::IsFirstLaunchAfterUpgrade() {
+bool MobileSessionShutdownMetricsProvider::IsFirstLaunchAfterUpgrade() {
   return [[PreviousSessionInfo sharedInstance] isFirstSessionAfterUpgrade];
 }
 
-bool IOSStabilityMetricsProvider::HasCrashLogs() {
+bool MobileSessionShutdownMetricsProvider::HasCrashLogs() {
   return breakpad_helper::HasReportToUpload();
 }
 
-bool IOSStabilityMetricsProvider::HasUploadedCrashReportsInBackground() {
+bool MobileSessionShutdownMetricsProvider::
+    HasUploadedCrashReportsInBackground() {
   return [CrashReportBackgroundUploader hasUploadedCrashReportsInBackground];
 }
 
-bool IOSStabilityMetricsProvider::ReceivedMemoryWarningBeforeLastShutdown() {
+bool MobileSessionShutdownMetricsProvider::
+    ReceivedMemoryWarningBeforeLastShutdown() {
   return [[PreviousSessionInfo sharedInstance]
       didSeeMemoryWarningShortlyBeforeTerminating];
 }
diff --git a/ios/chrome/browser/metrics/ios_stability_metrics_provider_unittest.mm b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm
index 1f08314..2074312 100644
--- a/ios/chrome/browser/metrics/ios_stability_metrics_provider_unittest.mm
+++ b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm
@@ -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 "ios/chrome/browser/metrics/ios_stability_metrics_provider.h"
+#include "ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ -24,28 +24,28 @@ bool IsMetricsReportingEnabled() {
 
 }  // namespace
 
-// An IOSStabilityMetricsProvider that returns fake values for the last session
-// environment query methods.
-class IOSStabilityMetricsProviderForTesting
-    : public IOSStabilityMetricsProvider {
+// An MobileSessionShutdownMetricsProvider that returns fake values for the last
+// session environment query methods.
+class MobileSessionShutdownMetricsProviderForTesting
+    : public MobileSessionShutdownMetricsProvider {
  public:
-  explicit IOSStabilityMetricsProviderForTesting(
+  explicit MobileSessionShutdownMetricsProviderForTesting(
       metrics::MetricsService* metrics_service)
-      : IOSStabilityMetricsProvider(metrics_service) {}
+      : MobileSessionShutdownMetricsProvider(metrics_service) {}
 
-  void SetIsFirstLaunchAfterUpgrade(bool value) {
+  void set_is_first_launch_after_upgrade(bool value) {
     is_first_launch_after_upgrade_ = value;
   }
-  void SetHasCrashLogs(bool value) { has_crash_logs_ = value; }
-  void SetHasUploadedCrashReportsInBackground(bool value) {
+  void set_has_crash_logs(bool value) { has_crash_logs_ = value; }
+  void set_has_uploaded_crash_reports_in_background(bool value) {
     has_uploaded_crash_reports_in_background_ = value;
   }
-  void SetReceivedMemoryWarningBeforeLastShutdown(bool value) {
+  void set_received_memory_warning_before_last_shutdown(bool value) {
     received_memory_warning_before_last_shutdown_ = value;
   }
 
  protected:
-  // IOSStabilityMetricsProvider:
+  // MobileSessionShutdownMetricsProvider:
   bool IsFirstLaunchAfterUpgrade() override {
     return is_first_launch_after_upgrade_;
   }
@@ -64,12 +64,13 @@ class IOSStabilityMetricsProviderForTesting
   bool has_uploaded_crash_reports_in_background_;
   bool received_memory_warning_before_last_shutdown_;
 
-  DISALLOW_COPY_AND_ASSIGN(IOSStabilityMetricsProviderForTesting);
+  DISALLOW_COPY_AND_ASSIGN(MobileSessionShutdownMetricsProviderForTesting);
 };
 
-class IOSStabilityMetricsProviderTest : public testing::TestWithParam<int> {
+class MobileSessionShutdownMetricsProviderTest
+    : public testing::TestWithParam<int> {
  public:
-  IOSStabilityMetricsProviderTest() {
+  MobileSessionShutdownMetricsProviderTest() {
     metrics::MetricsService::RegisterPrefs(local_state_.registry());
   }
 
@@ -78,25 +79,25 @@ class IOSStabilityMetricsProviderTest : public testing::TestWithParam<int> {
   metrics::TestMetricsServiceClient metrics_client_;
   scoped_ptr<metrics::MetricsStateManager> metrics_state_;
   scoped_ptr<metrics::MetricsService> metrics_service_;
-  scoped_ptr<IOSStabilityMetricsProviderForTesting> metrics_provider_;
+  scoped_ptr<MobileSessionShutdownMetricsProviderForTesting> metrics_provider_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(IOSStabilityMetricsProviderTest);
+  DISALLOW_COPY_AND_ASSIGN(MobileSessionShutdownMetricsProviderTest);
 };
 
 // Verifies that a sample is recorded in the correct bucket of the shutdown type
 // histogram when ProvideStabilityMetrics is invoked.
 //
 // This parameterized test receives a parameter in the range [0, 32), which is
-// used to generate values for five booleans based on the binary
-// representation of the parameter. The bits are assigned as follows (from
-// least significant to most significant):
+// used to generate values for five booleans based on the binary representation
+// of the parameter. The bits are assigned as follows (from least significant to
+// most significant):
 //  - received memory warning;
 //  - crash log present;
 //  - uploaded crash reports in background;
 //  - last shutdown was clean;
 //  - first launch after upgrade.
-TEST_P(IOSStabilityMetricsProviderTest, ProvideStabilityMetrics) {
+TEST_P(MobileSessionShutdownMetricsProviderTest, ProvideStabilityMetrics) {
   const bool received_memory_warning = GetParam() % 2;
   const bool has_crash_logs = (GetParam() >> 1) % 2;
   const bool has_uploaded_crash_reports_in_background = (GetParam() >> 2) % 2;
@@ -153,16 +154,16 @@ TEST_P(IOSStabilityMetricsProviderTest, ProvideStabilityMetrics) {
       metrics_state_.get(), &metrics_client_, &local_state_));
 
   // Create the metrics provider to test.
-  metrics_provider_.reset(
-      new IOSStabilityMetricsProviderForTesting(metrics_service_.get()));
+  metrics_provider_.reset(new MobileSessionShutdownMetricsProviderForTesting(
+      metrics_service_.get()));
 
   // Setup the metrics provider for the current test.
-  metrics_provider_->SetIsFirstLaunchAfterUpgrade(
+  metrics_provider_->set_is_first_launch_after_upgrade(
       is_first_launch_after_upgrade);
-  metrics_provider_->SetReceivedMemoryWarningBeforeLastShutdown(
+  metrics_provider_->set_received_memory_warning_before_last_shutdown(
       received_memory_warning);
-  metrics_provider_->SetHasCrashLogs(has_crash_logs);
-  metrics_provider_->SetHasUploadedCrashReportsInBackground(
+  metrics_provider_->set_has_crash_logs(has_crash_logs);
+  metrics_provider_->set_has_uploaded_crash_reports_in_background(
       has_uploaded_crash_reports_in_background);
 
   // Create a histogram tester for verifying samples written to the shutdown
@@ -177,5 +178,5 @@ TEST_P(IOSStabilityMetricsProviderTest, ProvideStabilityMetrics) {
 }
 
 INSTANTIATE_TEST_CASE_P(/* No InstantiationName */,
-                        IOSStabilityMetricsProviderTest,
+                        MobileSessionShutdownMetricsProviderTest,
                         testing::Range(0, 32));
diff --git a/ios/chrome/ios_chrome.gyp b/ios/chrome/ios_chrome.gyp
index 4ecd67e..5d0749d 100644
--- a/ios/chrome/ios_chrome.gyp
+++ b/ios/chrome/ios_chrome.gyp
@@ -361,8 +361,8 @@
         'browser/metrics/ios_chrome_metrics_services_manager_client.h',
         'browser/metrics/ios_chrome_stability_metrics_provider.cc',
         'browser/metrics/ios_chrome_stability_metrics_provider.h',
-        'browser/metrics/ios_stability_metrics_provider.h',
-        'browser/metrics/ios_stability_metrics_provider.mm',
+        'browser/metrics/mobile_session_shutdown_metrics_provider.h',
+        'browser/metrics/mobile_session_shutdown_metrics_provider.mm',
         'browser/metrics/previous_session_info.h',
         'browser/metrics/previous_session_info.mm',
         'browser/net/chrome_cookie_store_ios_client.h',
diff --git a/ios/chrome/ios_chrome_tests.gyp b/ios/chrome/ios_chrome_tests.gyp
index 367dfd1..d78bfc1 100644
--- a/ios/chrome/ios_chrome_tests.gyp
+++ b/ios/chrome/ios_chrome_tests.gyp
@@ -50,7 +50,7 @@
         'browser/installation_notifier_unittest.mm',
         'browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc',
         'browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc',
-        'browser/metrics/ios_stability_metrics_provider_unittest.mm',
+        'browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm',
         'browser/metrics/previous_session_info_unittest.mm',
         'browser/net/cookie_util_unittest.mm',
         'browser/net/image_fetcher_unittest.mm',