Move test files to the new test directory.

Bug: 1068142
Change-Id: I10ba127779a14c9cfa41bdf875ab65a2e6e38395
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2151890Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Commit-Queue: Caitlin Fischer <caitlinfischer@google.com>
Cr-Commit-Position: refs/heads/master@{#759666}

chrome/browser/metrics/chrome_metrics_service_client_unittest.cc

@@ -17,7 +17,7 @@
 #include "components/metrics/file_metrics_provider.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
-#include "components/metrics/test_enabled_state_provider.h"
+#include "components/metrics/test/test_enabled_state_provider.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/ukm/ukm_service.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/metrics/extensions_metrics_provider_unittest.cc

@@ -21,7 +21,7 @@
 #include "components/metrics/client_info.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
-#include "components/metrics/test_enabled_state_provider.h"
+#include "components/metrics/test/test_enabled_state_provider.h"
 #include "components/prefs/testing_pref_service.h"
 #include "extensions/browser/disable_reason.h"
 #include "extensions/browser/extension_prefs.h"

components/metrics/BUILD.gn

@@ -359,14 +359,14 @@ source_set("call_stack_profile_collector") {
 jumbo_static_library("test_support") {
   testonly = true
   sources = [
-    "test_enabled_state_provider.cc",
-    "test_enabled_state_provider.h",
-    "test_metrics_log_uploader.cc",
-    "test_metrics_log_uploader.h",
-    "test_metrics_provider.cc",
-    "test_metrics_provider.h",
-    "test_metrics_service_client.cc",
-    "test_metrics_service_client.h",
+    "test/test_enabled_state_provider.cc",
+    "test/test_enabled_state_provider.h",
+    "test/test_metrics_log_uploader.cc",
+    "test/test_metrics_log_uploader.h",
+    "test/test_metrics_provider.cc",
+    "test/test_metrics_provider.h",
+    "test/test_metrics_service_client.cc",
+    "test/test_metrics_service_client.h",
   ]
 
   public_deps = [ ":metrics" ]

components/metrics/metrics_log_manager_unittest.cc

@@ -14,7 +14,7 @@
 #include "components/metrics/metrics_log.h"
 #include "components/metrics/metrics_log_store.h"
 #include "components/metrics/metrics_pref_names.h"
-#include "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/metrics/metrics_log_store_unittest.cc

@@ -5,7 +5,7 @@
 #include "components/metrics/metrics_log_store.h"
 
 #include "components/metrics/metrics_pref_names.h"
-#include "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/metrics/metrics_log_unittest.cc

@@ -24,8 +24,8 @@
 #include "components/metrics/environment_recorder.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_state_manager.h"
-#include "components/metrics/test_metrics_provider.h"
-#include "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_metrics_provider.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/variations/active_field_trials.h"

components/metrics/metrics_service_client_unittest.cc

@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/metrics/metrics_switches.h"
-#include "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace metrics {

components/metrics/metrics_service_unittest.cc

@@ -27,9 +27,9 @@
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/metrics_upload_scheduler.h"
-#include "components/metrics/test_enabled_state_provider.h"
-#include "components/metrics/test_metrics_provider.h"
-#include "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_enabled_state_provider.h"
+#include "components/metrics/test/test_metrics_provider.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/zlib/google/compression_utils.h"

components/metrics/metrics_state_manager_unittest.cc

@@ -23,7 +23,7 @@
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_switches.h"
-#include "components/metrics/test_enabled_state_provider.h"
+#include "components/metrics/test/test_enabled_state_provider.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/variations/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/metrics/reporting_service_unittest.cc

@@ -17,7 +17,7 @@
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/metrics/log_store.h"
-#include "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/zlib/google/compression_utils.h"

components/metrics/test_enabled_state_provider.cc → components/metrics/test/test_enabled_state_provider.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 "components/metrics/test_enabled_state_provider.h"
+#include "components/metrics/test/test_enabled_state_provider.h"
 
 namespace metrics {
 

components/metrics/test_enabled_state_provider.h → components/metrics/test/test_enabled_state_provider.h

@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_METRICS_TEST_ENABLED_STATE_PROVIDER_H_
-#define COMPONENTS_METRICS_TEST_ENABLED_STATE_PROVIDER_H_
+#ifndef COMPONENTS_METRICS_TEST_TEST_ENABLED_STATE_PROVIDER_H_
+#define COMPONENTS_METRICS_TEST_TEST_ENABLED_STATE_PROVIDER_H_
 
 #include "base/macros.h"
 #include "components/metrics/enabled_state_provider.h"
 
-// TODO(crbug.com/1068142): Move this to the new test directory.
-
 namespace metrics {
 
 // A simple concrete implementation of the EnabledStateProvider interface, for
@@ -36,4 +34,4 @@ class TestEnabledStateProvider : public EnabledStateProvider {
 
 }  // namespace metrics
 
-#endif  // COMPONENTS_METRICS_TEST_ENABLED_STATE_PROVIDER_H_
+#endif  // COMPONENTS_METRICS_TEST_TEST_ENABLED_STATE_PROVIDER_H_

components/metrics/test_metrics_log_uploader.cc → components/metrics/test/test_metrics_log_uploader.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 "components/metrics/test_metrics_log_uploader.h"
+#include "components/metrics/test/test_metrics_log_uploader.h"
 #include "components/metrics/metrics_log_uploader.h"
 
 namespace metrics {

components/metrics/test_metrics_log_uploader.h → components/metrics/test/test_metrics_log_uploader.h

@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_METRICS_TEST_METRICS_LOG_UPLOADER_H_
-#define COMPONENTS_METRICS_TEST_METRICS_LOG_UPLOADER_H_
+#ifndef COMPONENTS_METRICS_TEST_TEST_METRICS_LOG_UPLOADER_H_
+#define COMPONENTS_METRICS_TEST_TEST_METRICS_LOG_UPLOADER_H_
 
 #include "components/metrics/metrics_log_uploader.h"
 #include "third_party/metrics_proto/reporting_info.pb.h"
 
-// TODO(crbug.com/1068142): Move this to the new test directory.
-
 namespace metrics {
 
 class TestMetricsLogUploader : public MetricsLogUploader {
@@ -42,4 +40,4 @@ class TestMetricsLogUploader : public MetricsLogUploader {
 
 }  // namespace metrics
 
-#endif  // COMPONENTS_METRICS_TEST_METRICS_LOG_UPLOADER_H_
+#endif  // COMPONENTS_METRICS_TEST_TEST_METRICS_LOG_UPLOADER_H_

components/metrics/test_metrics_provider.cc → components/metrics/test/test_metrics_provider.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 "components/metrics/test_metrics_provider.h"
+#include "components/metrics/test/test_metrics_provider.h"
 
 #include "base/metrics/histogram_macros.h"
 

components/metrics/test_metrics_provider.h → components/metrics/test/test_metrics_provider.h

@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_METRICS_TEST_METRICS_PROVIDER_H_
-#define COMPONENTS_METRICS_TEST_METRICS_PROVIDER_H_
+#ifndef COMPONENTS_METRICS_TEST_TEST_METRICS_PROVIDER_H_
+#define COMPONENTS_METRICS_TEST_TEST_METRICS_PROVIDER_H_
 
 #include "base/macros.h"
 #include "components/metrics/metrics_provider.h"
 
-// TODO(crbug.com/1068142): Move this to the new test directory.
-
 namespace metrics {
 
 // A simple implementation of MetricsProvider that checks that its providing
@@ -68,4 +66,4 @@ class TestMetricsProvider : public MetricsProvider {
 
 }  // namespace metrics
 
-#endif  // COMPONENTS_METRICS_TEST_METRICS_PROVIDER_H_
+#endif  // COMPONENTS_METRICS_TEST_TEST_METRICS_PROVIDER_H_

components/metrics/test_metrics_service_client.cc → components/metrics/test/test_metrics_service_client.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 "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 
 #include <memory>
 
@@ -21,8 +21,7 @@ TestMetricsServiceClient::TestMetricsServiceClient()
       reporting_is_managed_(false),
       enable_default_(EnableMetricsDefault::DEFAULT_UNKNOWN) {}
 
-TestMetricsServiceClient::~TestMetricsServiceClient() {
-}
+TestMetricsServiceClient::~TestMetricsServiceClient() {}
 
 metrics::MetricsService* TestMetricsServiceClient::GetMetricsService() {
   return nullptr;

components/metrics/test_metrics_service_client.h → components/metrics/test/test_metrics_service_client.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 COMPONENTS_METRICS_TEST_METRICS_SERVICE_CLIENT_H_
-#define COMPONENTS_METRICS_TEST_METRICS_SERVICE_CLIENT_H_
+#ifndef COMPONENTS_METRICS_TEST_TEST_METRICS_SERVICE_CLIENT_H_
+#define COMPONENTS_METRICS_TEST_TEST_METRICS_SERVICE_CLIENT_H_
 
 #include <stdint.h>
 
@@ -12,9 +12,7 @@
 #include "base/macros.h"
 #include "components/metrics/metrics_log_uploader.h"
 #include "components/metrics/metrics_service_client.h"
-#include "components/metrics/test_metrics_log_uploader.h"
-
-// TODO(crbug.com/1068142): Move this to the new test directory.
+#include "components/metrics/test/test_metrics_log_uploader.h"
 
 namespace metrics {
 
@@ -79,4 +77,4 @@ class TestMetricsServiceClient : public MetricsServiceClient {
 
 }  // namespace metrics
 
-#endif  // COMPONENTS_METRICS_TEST_METRICS_SERVICE_CLIENT_H_
+#endif  // COMPONENTS_METRICS_TEST_TEST_METRICS_SERVICE_CLIENT_H_

components/ukm/ukm_service_unittest.cc

@@ -22,8 +22,8 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/metrics/metrics_log_uploader.h"
-#include "components/metrics/test_metrics_provider.h"
-#include "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_metrics_provider.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 #include "components/metrics/ukm_demographic_metrics_provider.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/ukm/ukm_pref_names.h"

components/variations/service/variations_service_unittest.cc

@@ -28,7 +28,7 @@
 #include "components/metrics/client_info.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_state_manager.h"
-#include "components/metrics/test_enabled_state_provider.h"
+#include "components/metrics/test/test_enabled_state_provider.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/variations/pref_names.h"
 #include "components/variations/proto/study.pb.h"

ios/chrome/browser/metrics/ios_chrome_metrics_service_client_unittest.mm

@@ -10,7 +10,7 @@
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/metrics_switches.h"
-#include "components/metrics/test_enabled_state_provider.h"
+#include "components/metrics/test/test_enabled_state_provider.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/ukm/ukm_service.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"

ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm

@@ -16,8 +16,8 @@
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
-#include "components/metrics/test_enabled_state_provider.h"
-#include "components/metrics/test_metrics_service_client.h"
+#include "components/metrics/test/test_enabled_state_provider.h"
+#include "components/metrics/test/test_metrics_service_client.h"
 #include "components/prefs/testing_pref_service.h"
 #import "ios/chrome/browser/metrics/previous_session_info.h"
 #import "ios/chrome/browser/metrics/previous_session_info_private.h"