Move the files related to tab_stats_tracker to a new directory
This will allow having owners more familiar with this code for these
files.
Change-Id: Idcb5891a9aed8d499171904273dfd24a7c763008
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679631
Auto-Submit: Sébastien Marchand <[email protected]>
Commit-Queue: Sébastien Marchand <[email protected]>
Reviewed-by: Gabriel Charette <[email protected]>
Reviewed-by: Oliver Li <[email protected]>
Reviewed-by: Steven Holte <[email protected]>
Cr-Commit-Position: refs/heads/master@{#852447}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 975d64470d..c75f239 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3742,12 +3742,12 @@
"metrics/first_web_contents_profiler.cc",
"metrics/first_web_contents_profiler.h",
"metrics/incognito_observer_desktop.cc",
- "metrics/tab_stats_data_store.cc",
- "metrics/tab_stats_data_store.h",
- "metrics/tab_stats_observer.h",
- "metrics/tab_stats_tracker.cc",
- "metrics/tab_stats_tracker.h",
- "metrics/tab_stats_tracker_delegate.h",
+ "metrics/tab_stats/tab_stats_data_store.cc",
+ "metrics/tab_stats/tab_stats_data_store.h",
+ "metrics/tab_stats/tab_stats_observer.h",
+ "metrics/tab_stats/tab_stats_tracker.cc",
+ "metrics/tab_stats/tab_stats_tracker.h",
+ "metrics/tab_stats/tab_stats_tracker_delegate.h",
"metrics/usage_scenario/tab_usage_scenario_tracker.cc",
"metrics/usage_scenario/tab_usage_scenario_tracker.h",
"notifications/muted_notification_handler.cc",
@@ -4729,8 +4729,8 @@
"metrics/jumplist_metrics_win.cc",
"metrics/jumplist_metrics_win.h",
"metrics/power/battery_level_provider_win.cc",
- "metrics/tab_stats_tracker_delegate_win.cc",
- "metrics/tab_stats_tracker_win.cc",
+ "metrics/tab_stats/tab_stats_tracker_delegate_win.cc",
+ "metrics/tab_stats/tab_stats_tracker_win.cc",
"net/service_providers_win.cc",
"net/service_providers_win.h",
"notifications/win/notification_template_builder.cc",
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
index 71557874..46769834 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -45,7 +45,7 @@
#if !defined(OS_ANDROID)
#include "chrome/browser/metrics/first_web_contents_profiler.h"
-#include "chrome/browser/metrics/tab_stats_tracker.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#endif // !defined(OS_ANDROID)
#if defined(OS_ANDROID) && defined(__arm__)
diff --git a/chrome/browser/metrics/tab_stats/OWNERS b/chrome/browser/metrics/tab_stats/OWNERS
new file mode 100644
index 0000000..a870b13
--- /dev/null
+++ b/chrome/browser/metrics/tab_stats/OWNERS
@@ -0,0 +1,3 @@
[email protected]
[email protected]
[email protected]
diff --git a/chrome/browser/metrics/tab_stats_data_store.cc b/chrome/browser/metrics/tab_stats/tab_stats_data_store.cc
similarity index 98%
rename from chrome/browser/metrics/tab_stats_data_store.cc
rename to chrome/browser/metrics/tab_stats/tab_stats_data_store.cc
index 7e7b5a8..363f0a36 100644
--- a/chrome/browser/metrics/tab_stats_data_store.cc
+++ b/chrome/browser/metrics/tab_stats/tab_stats_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/tab_stats_data_store.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_data_store.h"
#include <algorithm>
#include <utility>
@@ -32,8 +32,7 @@
total_tab_count_max(0U),
max_tab_per_window(0U),
window_count(0U),
- window_count_max(0U) {
-}
+ window_count_max(0U) {}
TabStatsDataStore::TabsStats::TabsStats(const TabsStats& other) = default;
TabStatsDataStore::TabStatsDataStore(PrefService* pref_service)
diff --git a/chrome/browser/metrics/tab_stats_data_store.h b/chrome/browser/metrics/tab_stats/tab_stats_data_store.h
similarity index 95%
rename from chrome/browser/metrics/tab_stats_data_store.h
rename to chrome/browser/metrics/tab_stats/tab_stats_data_store.h
index 4bd666a..b17e9ed 100644
--- a/chrome/browser/metrics/tab_stats_data_store.h
+++ b/chrome/browser/metrics/tab_stats/tab_stats_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_TAB_STATS_DATA_STORE_H_
-#define CHROME_BROWSER_METRICS_TAB_STATS_DATA_STORE_H_
+#ifndef CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_DATA_STORE_H_
+#define CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_DATA_STORE_H_
#include <memory>
#include <vector>
@@ -13,7 +13,7 @@
#include "base/optional.h"
#include "base/profiler/sample_metadata.h"
#include "base/sequence_checker.h"
-#include "chrome/browser/metrics/tab_stats_observer.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_observer.h"
#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom.h"
#include "content/public/browser/visibility.h"
@@ -165,4 +165,4 @@
} // namespace metrics
-#endif // CHROME_BROWSER_METRICS_TAB_STATS_DATA_STORE_H_
+#endif // CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_DATA_STORE_H_
diff --git a/chrome/browser/metrics/tab_stats_data_store_unittest.cc b/chrome/browser/metrics/tab_stats/tab_stats_data_store_unittest.cc
similarity index 98%
rename from chrome/browser/metrics/tab_stats_data_store_unittest.cc
rename to chrome/browser/metrics/tab_stats/tab_stats_data_store_unittest.cc
index bfa8c29b..ee46e11 100644
--- a/chrome/browser/metrics/tab_stats_data_store_unittest.cc
+++ b/chrome/browser/metrics/tab_stats/tab_stats_data_store_unittest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/metrics/tab_stats_data_store.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_data_store.h"
-#include "chrome/browser/metrics/tab_stats_tracker.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#include "chrome/browser/ui/recently_audible_helper.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/metrics/tab_stats_observer.h b/chrome/browser/metrics/tab_stats/tab_stats_observer.h
similarity index 89%
rename from chrome/browser/metrics/tab_stats_observer.h
rename to chrome/browser/metrics/tab_stats/tab_stats_observer.h
index b436164..c135e34c 100644
--- a/chrome/browser/metrics/tab_stats_observer.h
+++ b/chrome/browser/metrics/tab_stats/tab_stats_observer.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_TAB_STATS_OBSERVER_H_
-#define CHROME_BROWSER_METRICS_TAB_STATS_OBSERVER_H_
+#ifndef CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_OBSERVER_H_
+#define CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_OBSERVER_H_
#include "base/observer_list_types.h"
#include "content/public/browser/visibility.h"
@@ -45,4 +45,4 @@
} // namespace metrics
-#endif // CHROME_BROWSER_METRICS_TAB_STATS_OBSERVER_H_
+#endif // CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_OBSERVER_H_
diff --git a/chrome/browser/metrics/tab_stats_tracker.cc b/chrome/browser/metrics/tab_stats/tab_stats_tracker.cc
similarity index 99%
rename from chrome/browser/metrics/tab_stats_tracker.cc
rename to chrome/browser/metrics/tab_stats/tab_stats_tracker.cc
index 5dcc0f70..5c09087 100644
--- a/chrome/browser/metrics/tab_stats_tracker.cc
+++ b/chrome/browser/metrics/tab_stats/tab_stats_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/tab_stats_tracker.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#include <algorithm>
#include <string>
diff --git a/chrome/browser/metrics/tab_stats_tracker.h b/chrome/browser/metrics/tab_stats/tab_stats_tracker.h
similarity index 96%
rename from chrome/browser/metrics/tab_stats_tracker.h
rename to chrome/browser/metrics/tab_stats/tab_stats_tracker.h
index c7b9912..47287aa3 100644
--- a/chrome/browser/metrics/tab_stats_tracker.h
+++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker.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_TAB_STATS_TRACKER_H_
-#define CHROME_BROWSER_METRICS_TAB_STATS_TRACKER_H_
+#ifndef CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_TRACKER_H_
+#define CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_TRACKER_H_
#include <map>
#include <memory>
@@ -19,8 +19,8 @@
#include "base/sequence_checker.h"
#include "base/timer/timer.h"
#include "build/build_config.h"
-#include "chrome/browser/metrics/tab_stats_data_store.h"
-#include "chrome/browser/metrics/tab_stats_tracker_delegate.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_data_store.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker_delegate.h"
#include "chrome/browser/ui/browser_list_observer.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "components/metrics/daily_event.h"
@@ -297,4 +297,4 @@
} // namespace metrics
-#endif // CHROME_BROWSER_METRICS_TAB_STATS_TRACKER_H_
+#endif // CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_TRACKER_H_
diff --git a/chrome/browser/metrics/tab_stats_tracker_browsertest.cc b/chrome/browser/metrics/tab_stats/tab_stats_tracker_browsertest.cc
similarity index 99%
rename from chrome/browser/metrics/tab_stats_tracker_browsertest.cc
rename to chrome/browser/metrics/tab_stats/tab_stats_tracker_browsertest.cc
index b28cc49..bc76f32 100644
--- a/chrome/browser/metrics/tab_stats_tracker_browsertest.cc
+++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker_browsertest.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/tab_stats_tracker.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#include <memory>
#include <vector>
diff --git a/chrome/browser/metrics/tab_stats_tracker_delegate.h b/chrome/browser/metrics/tab_stats/tab_stats_tracker_delegate.h
similarity index 75%
rename from chrome/browser/metrics/tab_stats_tracker_delegate.h
rename to chrome/browser/metrics/tab_stats/tab_stats_tracker_delegate.h
index b93719d5..028594e 100644
--- a/chrome/browser/metrics/tab_stats_tracker_delegate.h
+++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker_delegate.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_TAB_STATS_TRACKER_DELEGATE_H_
-#define CHROME_BROWSER_METRICS_TAB_STATS_TRACKER_DELEGATE_H_
+#ifndef CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_TRACKER_DELEGATE_H_
+#define CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_TRACKER_DELEGATE_H_
#include "build/build_config.h"
@@ -26,4 +26,4 @@
#endif // OS_WIN
};
-#endif // CHROME_BROWSER_METRICS_TAB_STATS_TRACKER_DELEGATE_H_
+#endif // CHROME_BROWSER_METRICS_TAB_STATS_TAB_STATS_TRACKER_DELEGATE_H_
diff --git a/chrome/browser/metrics/tab_stats_tracker_delegate_win.cc b/chrome/browser/metrics/tab_stats/tab_stats_tracker_delegate_win.cc
similarity index 85%
rename from chrome/browser/metrics/tab_stats_tracker_delegate_win.cc
rename to chrome/browser/metrics/tab_stats/tab_stats_tracker_delegate_win.cc
index 37c35d1..49167d9 100644
--- a/chrome/browser/metrics/tab_stats_tracker_delegate_win.cc
+++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker_delegate_win.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/tab_stats_tracker_delegate.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker_delegate.h"
#include "ui/aura_extra/window_occlusion_win.h"
diff --git a/chrome/browser/metrics/tab_stats_tracker_unittest.cc b/chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc
similarity index 99%
rename from chrome/browser/metrics/tab_stats_tracker_unittest.cc
rename to chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc
index d566ee7..6f3be7f 100644
--- a/chrome/browser/metrics/tab_stats_tracker_unittest.cc
+++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker_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/tab_stats_tracker.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#include <algorithm>
@@ -33,9 +33,9 @@
class TestTabStatsTracker : public TabStatsTracker {
public:
+ using TabStatsTracker::OnHeartbeatEvent;
using TabStatsTracker::OnInitialOrInsertedTab;
using TabStatsTracker::OnInterval;
- using TabStatsTracker::OnHeartbeatEvent;
using TabStatsTracker::TabChangedAt;
using UmaStatsReportingDelegate = TabStatsTracker::UmaStatsReportingDelegate;
diff --git a/chrome/browser/metrics/tab_stats_tracker_win.cc b/chrome/browser/metrics/tab_stats/tab_stats_tracker_win.cc
similarity index 97%
rename from chrome/browser/metrics/tab_stats_tracker_win.cc
rename to chrome/browser/metrics/tab_stats/tab_stats_tracker_win.cc
index 4812ff95..023d3c7ca 100644
--- a/chrome/browser/metrics/tab_stats_tracker_win.cc
+++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker_win.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/tab_stats_tracker.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#include "base/metrics/histogram_macros.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker.h b/chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker.h
index c466ab1..09ce828e 100644
--- a/chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker.h
+++ b/chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_METRICS_USAGE_SCENARIO_TAB_USAGE_SCENARIO_TRACKER_H_
#include "base/containers/flat_set.h"
-#include "chrome/browser/metrics/tab_stats_observer.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_observer.h"
#include "chrome/browser/metrics/usage_scenario/usage_scenario_tracker.h"
#include "content/public/browser/visibility.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 13e5d684..a47827b 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -232,7 +232,7 @@
#include "chrome/browser/gcm/gcm_product_util.h"
#include "chrome/browser/intranet_redirect_detector.h"
#include "chrome/browser/media/unified_autoplay_config.h"
-#include "chrome/browser/metrics/tab_stats_tracker.h"
+#include "chrome/browser/metrics/tab_stats/tab_stats_tracker.h"
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
#include "chrome/browser/search/instant_service.h"
#include "chrome/browser/search/promos/promo_service.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 881390f..8fe49a13 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1147,7 +1147,7 @@
"../browser/metrics/oom/out_of_memory_reporter_browsertest.cc",
"../browser/metrics/process_memory_metrics_emitter_browsertest.cc",
"../browser/metrics/startup_metrics_browsertest.cc",
- "../browser/metrics/tab_stats_tracker_browsertest.cc",
+ "../browser/metrics/tab_stats/tab_stats_tracker_browsertest.cc",
"../browser/metrics/ukm_background_recorder_browsertest.cc",
"../browser/metrics/ukm_browsertest.cc",
"../browser/metrics/variations/force_field_trials_browsertest.cc",
@@ -4497,8 +4497,8 @@
"../browser/memory/enterprise_memory_limit_evaluator_unittest.cc",
"../browser/metrics/desktop_session_duration/desktop_session_duration_tracker_unittest.cc",
"../browser/metrics/desktop_session_duration/touch_mode_stats_tracker_unittest.cc",
- "../browser/metrics/tab_stats_data_store_unittest.cc",
- "../browser/metrics/tab_stats_tracker_unittest.cc",
+ "../browser/metrics/tab_stats/tab_stats_data_store_unittest.cc",
+ "../browser/metrics/tab_stats/tab_stats_tracker_unittest.cc",
"../browser/page_load_metrics/observers/session_restore_page_load_metrics_observer_unittest.cc",
"../browser/resource_coordinator/background_tab_navigation_throttle_unittest.cc",
"../browser/resource_coordinator/decision_details_unittest.cc",
