Move chromeos/ test files to chromeos/test

For trivial file moves in policy browser tests:
TBR=emaxx@chromium.org

Bug: 918682
Change-Id: Ie46d17b4d1fb5ff6f106f7662a192eb580888d84
Reviewed-on: https://chromium-review.googlesource.com/c/1392605
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619695}

chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc

@@ -18,8 +18,8 @@
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/chromeos_test_utils.h"
 #include "chromeos/constants/chromeos_switches.h"
+#include "chromeos/test/chromeos_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc

@@ -23,7 +23,6 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
-#include "chromeos/chromeos_test_utils.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/dbus/dbus_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -32,6 +31,7 @@
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/upstart_client.h"
 #include "chromeos/network/network_state_handler.h"
+#include "chromeos/test/chromeos_test_utils.h"
 #include "components/language/core/browser/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/test/browser_test_utils.h"

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

@@ -67,7 +67,6 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/audio/cras_audio_handler.h"
-#include "chromeos/chromeos_test_utils.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/dbus/dbus_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -81,6 +80,7 @@
 #include "chromeos/settings/timezone_settings.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "chromeos/system/statistics_provider.h"
+#include "chromeos/test/chromeos_test_utils.h"
 #include "chromeos/timezone/timezone_request.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/prefs/pref_registry_simple.h"

chrome/browser/chromeos/policy/user_network_configuration_updater_factory_browsertest.cc

@@ -28,13 +28,13 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/chromeos_test_utils.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/network/network_cert_loader.h"
 #include "chromeos/network/onc/onc_certificate_importer.h"
 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
 #include "chromeos/network/onc/onc_test_utils.h"
 #include "chromeos/policy_certificate_provider.h"
+#include "chromeos/test/chromeos_test_utils.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"

chromeos/BUILD.gn

@@ -270,8 +270,6 @@ source_set("test_support_source_set") {
   sources = [
     "attestation/mock_attestation_flow.cc",
     "attestation/mock_attestation_flow.h",
-    "chromeos_test_utils.cc",
-    "chromeos_test_utils.h",
     "cryptohome/mock_async_method_caller.cc",
     "cryptohome/mock_async_method_caller.h",
     "cryptohome/mock_homedir_methods.cc",
@@ -302,6 +300,8 @@ source_set("test_support_source_set") {
     "network/onc/onc_test_utils.h",
     "network/portal_detector/mock_network_portal_detector.cc",
     "network/portal_detector/mock_network_portal_detector.h",
+    "test/chromeos_test_utils.cc",
+    "test/chromeos_test_utils.h",
   ]
 }
 
@@ -375,10 +375,10 @@ test("chromeos_unittests") {
     "printing/printer_translator_unittest.cc",
     "process_proxy/process_output_watcher_unittest.cc",
     "process_proxy/process_proxy_unittest.cc",
-    "run_all_unittests.cc",
     "system/cpu_temperature_reader_unittest.cc",
     "system/factory_ping_embargo_check_unittest.cc",
     "system/name_value_pairs_parser_unittest.cc",
+    "test/run_all_unittests.cc",
     "timezone/timezone_unittest.cc",
     "tools/variable_expander_unittest.cc",
     "tpm/tpm_token_info_getter_unittest.cc",

chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "chromeos/app_mode/kiosk_oem_manifest_parser.h"
 
-#include "chromeos/chromeos_test_utils.h"
+#include "chromeos/test/chromeos_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {

chromeos/network/onc/onc_test_utils.cc

@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
-#include "chromeos/chromeos_test_utils.h"
+#include "chromeos/test/chromeos_test_utils.h"
 
 namespace chromeos {
 namespace onc {

chromeos/network/onc/onc_utils_unittest.cc

@@ -12,10 +12,10 @@
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "chromeos/chromeos_test_utils.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_test_utils.h"
+#include "chromeos/test/chromeos_test_utils.h"
 #include "chromeos/tools/variable_expander.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chromeos/chromeos_test_utils.cc → chromeos/test/chromeos_test_utils.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 "chromeos/chromeos_test_utils.h"
+#include "chromeos/test/chromeos_test_utils.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"

chromeos/chromeos_test_utils.h → chromeos/test/chromeos_test_utils.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 CHROMEOS_CHROMEOS_TEST_UTILS_H_
-#define CHROMEOS_CHROMEOS_TEST_UTILS_H_
+#ifndef CHROMEOS_TEST_CHROMEOS_TEST_UTILS_H_
+#define CHROMEOS_TEST_CHROMEOS_TEST_UTILS_H_
 
 #include <string>
 
@@ -22,4 +22,4 @@ bool GetTestDataPath(const std::string& component,
 }  // namespace test_utils
 }  // namespace chromeos
 
-#endif  // CHROMEOS_CHROMEOS_TEST_UTILS_H_
+#endif  // CHROMEOS_TEST_CHROMEOS_TEST_UTILS_H_