[battery] Move the usage scenario files to a new sub dir in c/b/metrics

as discussed in https://chromium-review.googlesource.com/c/chromium/src/+/2621678

Bug: 1153193
Change-Id: Ib5068b627c9e91644857892a57213414b9cfd77c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627886Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Reviewed-by: Weilun Shi <sweilun@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844770}

chrome/browser/BUILD.gn

@@ -844,10 +844,10 @@ static_library("browser") {
     "metrics/thread_watcher_report_hang.h",
     "metrics/ukm_background_recorder_service.cc",
     "metrics/ukm_background_recorder_service.h",
-    "metrics/usage_scenario_data_store.cc",
-    "metrics/usage_scenario_data_store.h",
-    "metrics/usage_scenario_tracker.cc",
-    "metrics/usage_scenario_tracker.h",
+    "metrics/usage_scenario/usage_scenario_data_store.cc",
+    "metrics/usage_scenario/usage_scenario_data_store.h",
+    "metrics/usage_scenario/usage_scenario_tracker.cc",
+    "metrics/usage_scenario/usage_scenario_tracker.h",
     "metrics/variations/chrome_variations_service_client.cc",
     "metrics/variations/chrome_variations_service_client.h",
     "native_window_notification_source.h",

chrome/browser/metrics/usage_scenario/OWNERS

+fdoray@chromium.org
+sebmarchand@chromium.org

chrome/browser/metrics/usage_scenario_data_store.cc → chrome/browser/metrics/usage_scenario/usage_scenario_data_store.cc

@@ -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 "chrome/browser/metrics/usage_scenario_data_store.h"
+#include "chrome/browser/metrics/usage_scenario/usage_scenario_data_store.h"
 
 #include <algorithm>
 

chrome/browser/metrics/usage_scenario_data_store.h → chrome/browser/metrics/usage_scenario/usage_scenario_data_store.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 CHROME_BROWSER_METRICS_USAGE_SCENARIO_DATA_STORE_H_
-#define CHROME_BROWSER_METRICS_USAGE_SCENARIO_DATA_STORE_H_
+#ifndef CHROME_BROWSER_METRICS_USAGE_SCENARIO_USAGE_SCENARIO_DATA_STORE_H_
+#define CHROME_BROWSER_METRICS_USAGE_SCENARIO_USAGE_SCENARIO_DATA_STORE_H_
 
 #include "base/sequence_checker.h"
 #include "base/time/time.h"
@@ -124,4 +124,4 @@ class UsageScenarioDataStoreImpl : public UsageScenarioDataStore {
   SEQUENCE_CHECKER(sequence_checker_);
 };
 
-#endif  // CHROME_BROWSER_METRICS_USAGE_SCENARIO_DATA_STORE_H_
+#endif  // CHROME_BROWSER_METRICS_USAGE_SCENARIO_USAGE_SCENARIO_DATA_STORE_H_

chrome/browser/metrics/usage_scenario_data_store_unittest.cc → chrome/browser/metrics/usage_scenario/usage_scenario_data_store_unittest.cc

@@ -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 "chrome/browser/metrics/usage_scenario_data_store.h"
+#include "chrome/browser/metrics/usage_scenario/usage_scenario_data_store.h"
 
 #include <tuple>
 

chrome/browser/metrics/usage_scenario_tracker.cc → chrome/browser/metrics/usage_scenario/usage_scenario_tracker.cc

@@ -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 "chrome/browser/metrics/usage_scenario_tracker.h"
+#include "chrome/browser/metrics/usage_scenario/usage_scenario_tracker.h"
 
 UsageScenarioTracker::UsageScenarioTracker() = default;
 UsageScenarioTracker::~UsageScenarioTracker() = default;

chrome/browser/metrics/usage_scenario_tracker.h → chrome/browser/metrics/usage_scenario/usage_scenario_tracker.h

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_METRICS_USAGE_SCENARIO_TRACKER_H_
-#define CHROME_BROWSER_METRICS_USAGE_SCENARIO_TRACKER_H_
+#ifndef CHROME_BROWSER_METRICS_USAGE_SCENARIO_USAGE_SCENARIO_TRACKER_H_
+#define CHROME_BROWSER_METRICS_USAGE_SCENARIO_USAGE_SCENARIO_TRACKER_H_
 
 #include "base/sequence_checker.h"
-#include "chrome/browser/metrics/usage_scenario_data_store.h"
+#include "chrome/browser/metrics/usage_scenario/usage_scenario_data_store.h"
 
 // Registers as an observer to various components to maintain a
 // UsageScenarioDataStore.
@@ -28,4 +28,4 @@ class UsageScenarioTracker {
   SEQUENCE_CHECKER(sequence_checker_);
 };
 
-#endif  // CHROME_BROWSER_METRICS_USAGE_SCENARIO_TRACKER_H_
+#endif  // CHROME_BROWSER_METRICS_USAGE_SCENARIO_USAGE_SCENARIO_TRACKER_H_

chrome/test/BUILD.gn

@@ -3551,7 +3551,7 @@ test("unit_tests") {
     "../browser/metrics/process_memory_metrics_emitter_unittest.cc",
     "../browser/metrics/tab_footprint_aggregator_unittest.cc",
     "../browser/metrics/thread_watcher_unittest.cc",
-    "../browser/metrics/usage_scenario_data_store_unittest.cc",
+    "../browser/metrics/usage_scenario/usage_scenario_data_store_unittest.cc",
     "../browser/navigation_predictor/navigation_predictor_renderer_warmup_client_unittest.cc",
     "../browser/navigation_predictor/navigation_predictor_unittest.cc",
     "../browser/net/chrome_network_delegate_unittest.cc",