Componentize DriveMetricsProvider*

components/metrics/drive_metrics_provider.h

Index: components/metrics/drive_metrics_provider.h
diff --git a/chrome/browser/metrics/drive_metrics_provider.h b/components/metrics/drive_metrics_provider.h
similarity index 74%
rename from chrome/browser/metrics/drive_metrics_provider.h
rename to components/metrics/drive_metrics_provider.h
index 6ddccec28bc68a4997389b710d4a272736b77f62..54a94ce2b55d6c66a188f3142013dab3077e6c78 100644
--- a/chrome/browser/metrics/drive_metrics_provider.h
+++ b/components/metrics/drive_metrics_provider.h
@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_METRICS_DRIVE_METRICS_PROVIDER_H_
-#define CHROME_BROWSER_METRICS_DRIVE_METRICS_PROVIDER_H_
+#ifndef COMPONENTS_METRICS_DRIVE_METRICS_PROVIDER_H_
+#define COMPONENTS_METRICS_DRIVE_METRICS_PROVIDER_H_
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"

[Alexei Svitkine (slow), 2015/07/30 16:59:52]

If this is for the scoped_refptr, should it be base/memory/ref_counted.h?

[blundell, 2015/07/30 19:17:14]

Yep. Done.

 #include "base/memory/weak_ptr.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "components/metrics/metrics_provider.h"
 #include "components/metrics/proto/system_profile.pb.h"
@@ -17,21 +19,24 @@ namespace base {
 class FilePath;
 }
 
+namespace metrics {
+
 // Provides metrics about the local drives on a user's computer. Currently only
 // checks to see if they incur a seek-time penalty (e.g. if they're SSDs).
 //
 // Defers gathering metrics until after "rush hour" (startup) so as to not bog
-// down the FILE thread.
+// down the file thread.
 class DriveMetricsProvider : public metrics::MetricsProvider {
  public:
-  DriveMetricsProvider();
+  DriveMetricsProvider(scoped_refptr<base::SequencedTaskRunner> file_thread,
+                       int local_state_path_key);
   ~DriveMetricsProvider() override;
 
   // metrics::MetricsDataProvider:
   void ProvideSystemProfileMetrics(
       metrics::SystemProfileProto* system_profile_proto) override;
 
-  // Called by ChromeMetricsServiceClient to start gathering metrics.
+  // Called to start gathering metrics.
   void GetDriveMetrics(const base::Closure& done);
 
  private:
@@ -55,8 +60,8 @@ class DriveMetricsProvider : public metrics::MetricsProvider {
   static bool HasSeekPenalty(const base::FilePath& path,
                              bool* has_seek_penalty);
 
-  // Gather metrics about various drives on the FILE thread.
-  static DriveMetrics GetDriveMetricsOnFileThread();
+  // Gather metrics about various drives on |file_thread_|.
+  static DriveMetrics GetDriveMetricsOnFileThread(int local_state_path_key);
 
   // Tries to determine whether there is a penalty for seeking on the drive that
   // hosts |path_service_key| (for example: the drive that holds "Local State").
@@ -67,9 +72,12 @@ class DriveMetricsProvider : public metrics::MetricsProvider {
   void GotDriveMetrics(const DriveMetrics& metrics);
 
   // Fills |drive| with information from successful |response|s.
-  void FillDriveMetrics(
-      const SeekPenaltyResponse& response,
-      metrics::SystemProfileProto::Hardware::Drive* drive);
+  void FillDriveMetrics(const SeekPenaltyResponse& response,
+                        metrics::SystemProfileProto::Hardware::Drive* drive);
+
+  scoped_refptr<base::SequencedTaskRunner> file_thread_;
+
+  int local_state_path_key_;

[Alexei Svitkine (slow), 2015/07/30 16:59:52]

Nit: Add comments above the members.

[blundell, 2015/07/30 19:17:14]

Done.

 
   // Information gathered about various important drives.
   DriveMetrics metrics_;
@@ -83,4 +91,6 @@ class DriveMetricsProvider : public metrics::MetricsProvider {
   DISALLOW_COPY_AND_ASSIGN(DriveMetricsProvider);
 };
 
-#endif  // CHROME_BROWSER_METRICS_DRIVE_METRICS_PROVIDER_H_
+}  // namespace metrics
+
+#endif  // COMPONENTS_METRICS_DRIVE_METRICS_PROVIDER_H_