Revert 197960 "[chromeos] Remove dependencies of StatisticsProvi..."

> [chromeos] Remove dependencies of StatisticsProvider on chrome.
> 
> BUG=180711
> R=davemoore@google.com
> 
> Review URL: https://codereview.chromium.org/14643006

TBR=phajdan.jr@chromium.org

Review URL: https://codereview.chromium.org/14642018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197969 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 57 insertions, 96 deletions

diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser.cc b/chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser.cc
index c51296f..da1554c 100644
--- a/chromeos/app_mode/kiosk_oem_manifest_parser.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser.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/app_mode/kiosk_oem_manifest_parser.h"
+#include "chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser.h"
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/stringprintf.h"
diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser.h b/chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser.h
index 05b7e0a..93f9518 100644
--- a/chromeos/app_mode/kiosk_oem_manifest_parser.h
+++ b/chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser.h
@@ -2,18 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
-#define CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
+#define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
-#include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 
 // Parser for app kiosk OEM manifest files.
-class CHROMEOS_EXPORT KioskOemManifestParser {
+class KioskOemManifestParser {
  public:
   // Kiosk OEM manifest.
   struct Manifest {
@@ -41,4 +40,4 @@ class CHROMEOS_EXPORT KioskOemManifestParser {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc b/chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc
index 246a797..2b6c833 100644
--- a/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/app_mode/kiosk_oem_manifest_parser.h"
+#include "chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser.h"
 
 #include "base/path_service.h"
-#include "chromeos/chromeos_test_utils.h"
+#include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
@@ -14,10 +14,9 @@ typedef testing::Test KioskOemManifestParserTest;
 
 TEST_F(KioskOemManifestParserTest, LoadTest) {
   base::FilePath test_data_dir;
-  ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
-                  "app_mode", "kiosk_manifest", &test_data_dir));
-  base::FilePath kiosk_oem_file =
-      test_data_dir.AppendASCII("kiosk_manifest.json");
+  PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+  base::FilePath kiosk_oem_file = test_data_dir.Append(FILE_PATH_LITERAL(
+      "chromeos/app_mode/kiosk_manifest/kiosk_manifest.json"));
   KioskOemManifestParser::Manifest manifest;
   EXPECT_TRUE(KioskOemManifestParser::Load(kiosk_oem_file, &manifest));
   EXPECT_TRUE(manifest.enterprise_managed);
diff --git a/chrome/browser/chromeos/drive/file_cache.cc b/chrome/browser/chromeos/drive/file_cache.cc
index dc9a4ee..dae7e4c 100644
--- a/chrome/browser/chromeos/drive/file_cache.cc
+++ b/chrome/browser/chromeos/drive/file_cache.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/chromeos/drive/file_cache_observer.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/google_apis/task_util.h"
-#include "chromeos/chromeos_constants.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc
index f1ff957..11d6f9b 100644
--- a/chrome/browser/chromeos/drive/file_system_util.cc
+++ b/chrome/browser/chromeos/drive/file_system_util.cc
@@ -23,7 +23,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/url_constants.h"
-#include "chromeos/chromeos_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
 #include "webkit/fileapi/file_system_url.h"
@@ -223,7 +222,7 @@ base::FilePath GetCacheRootPath(Profile* profile) {
   base::FilePath cache_base_path;
   chrome::GetUserCacheDirectory(profile->GetPath(), &cache_base_path);
   base::FilePath cache_root_path =
-      cache_base_path.Append(chromeos::kDriveCacheDirname);
+      cache_base_path.Append(chrome::kDriveCacheDirname);
   return cache_root_path.Append(kFileCacheVersionDir);
 }
 
diff --git a/chrome/browser/chromeos/login/scoped_gaia_auth_extension.cc b/chrome/browser/chromeos/login/scoped_gaia_auth_extension.cc
index d2efe5a..c36f295 100644
--- a/chrome/browser/chromeos/login/scoped_gaia_auth_extension.cc
+++ b/chrome/browser/chromeos/login/scoped_gaia_auth_extension.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chromeos/chromeos_constants.h"
 #include "grit/browser_resources.h"
 
 namespace chromeos {
@@ -39,7 +38,7 @@ void LoadGaiaAuthExtension(Profile* profile) {
   bool force_keyboard_oobe = false;
   chromeos::system::StatisticsProvider* provider =
       chromeos::system::StatisticsProvider::GetInstance();
-  provider->GetMachineFlag(chromeos::kOemKeyboardDrivenOobeKey,
+  provider->GetMachineFlag(chrome::kOemKeyboardDrivenOobeKey,
                            &force_keyboard_oobe);
   if (force_keyboard_oobe) {
     component_loader->Add(IDR_GAIA_AUTH_KEYBOARD_MANIFEST,
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index b03e7de..d4bac2c 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -53,7 +53,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
-#include "chromeos/chromeos_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
@@ -168,9 +167,9 @@ WizardController::WizardController(chromeos::LoginDisplayHost* host,
 
   chromeos::system::StatisticsProvider* provider =
       chromeos::system::StatisticsProvider::GetInstance();
-  provider->GetMachineFlag(chromeos::kOemIsEnterpriseManagedKey,
+  provider->GetMachineFlag(chrome::kOemIsEnterpriseManagedKey,
                            &force_enrollment_);
-  provider->GetMachineFlag(chromeos::kOemCanExitEnterpriseEnrollmentKey,
+  provider->GetMachineFlag(chrome::kOemCanExitEnterpriseEnrollmentKey,
                            &can_exit_enrollment_);
 }
 
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 373b142..4df0d4b 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -30,7 +30,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/chromeos_switches.h"
-#include "chromeos/chromeos_test_utils.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -365,11 +364,11 @@ class WizardControllerKioskFlowTest : public WizardControllerFlowTest {
   // Overridden from InProcessBrowserTest:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     base::FilePath test_data_dir;
-    ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
-                    "app_mode", "kiosk_manifest", &test_data_dir));
+    PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
     command_line->AppendSwitchPath(
         switches::kAppOemManifestFile,
-        test_data_dir.AppendASCII("kiosk_manifest.json"));
+         test_data_dir.Append(FILE_PATH_LITERAL(
+             "chromeos/app_mode/kiosk_manifest/kiosk_manifest.json")));
   }
 
  private:
diff --git a/chromeos/system/name_value_pairs_parser.cc b/chrome/browser/chromeos/system/name_value_pairs_parser.cc
index df65d50..4ac92e9 100644
--- a/chromeos/system/name_value_pairs_parser.cc
+++ b/chrome/browser/chromeos/system/name_value_pairs_parser.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/system/name_value_pairs_parser.h"
+#include "chrome/browser/chromeos/system/name_value_pairs_parser.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
diff --git a/chromeos/system/name_value_pairs_parser.h b/chrome/browser/chromeos/system/name_value_pairs_parser.h
index 2cb704b..a41a5ad5 100644
--- a/chromeos/system/name_value_pairs_parser.h
+++ b/chrome/browser/chromeos/system/name_value_pairs_parser.h
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
-#define CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
+#define CHROME_BROWSER_CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
-#include "chromeos/chromeos_export.h"
 
 namespace base {
 class FilePath;
@@ -20,7 +19,7 @@ namespace system {
 
 // The parser is used to get machine info as name-value pairs. Defined
 // here to be accessible by tests.
-class CHROMEOS_EXPORT NameValuePairsParser {
+class NameValuePairsParser {
  public:
   typedef std::map<std::string, std::string> NameValueMap;
 
@@ -80,4 +79,4 @@ class CHROMEOS_EXPORT NameValuePairsParser {
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
diff --git a/chromeos/system/name_value_pairs_parser_unittest.cc b/chrome/browser/chromeos/system/name_value_pairs_parser_unittest.cc
index e627521..dd70cd5 100644
--- a/chromeos/system/name_value_pairs_parser_unittest.cc
+++ b/chrome/browser/chromeos/system/name_value_pairs_parser_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 "chromeos/system/name_value_pairs_parser.h"
+#include "chrome/browser/chromeos/system/name_value_pairs_parser.h"
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc
index fe95de2..3a912d6a 100644
--- a/chrome/browser/chromeos/system/statistics_provider.cc
+++ b/chrome/browser/chromeos/system/statistics_provider.cc
@@ -15,10 +15,13 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
-#include "chromeos/app_mode/kiosk_oem_manifest_parser.h"
-#include "chromeos/chromeos_constants.h"
+#include "chrome/browser/chromeos/app_mode/kiosk_oem_manifest_parser.h"
+#include "chrome/browser/chromeos/system/name_value_pairs_parser.h"
+#include "chrome/common/child_process_logging.h"
+#include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chromeos/chromeos_switches.h"
-#include "chromeos/system/name_value_pairs_parser.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -248,13 +251,13 @@ void StatisticsProviderImpl::LoadOemManifestFromFile(
   if (!KioskOemManifestParser::Load(file, &oem_manifest))
     return;
 
-  machine_info_[chromeos::kOemDeviceRequisitionKey] =
+  machine_info_[chrome::kOemDeviceRequisitionKey] =
       oem_manifest.device_requisition;
-  machine_flags_[chromeos::kOemIsEnterpriseManagedKey] =
+  machine_flags_[chrome::kOemIsEnterpriseManagedKey] =
       oem_manifest.enterprise_managed;
-  machine_flags_[chromeos::kOemCanExitEnterpriseEnrollmentKey] =
+  machine_flags_[chrome::kOemCanExitEnterpriseEnrollmentKey] =
       oem_manifest.can_exit_enrollment;
-  machine_flags_[chromeos::kOemKeyboardDrivenOobeKey] =
+  machine_flags_[chrome::kOemKeyboardDrivenOobeKey] =
       oem_manifest.keyboard_driven_oobe;
 }
 
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index 7f5879c..6347e63 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -13,7 +13,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chromeos/chromeos_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -164,7 +163,7 @@ void CoreOobeHandler::UpdateOobeUIVisibility() {
   bool enable_keyboard_flow = false;
   chromeos::system::StatisticsProvider* provider =
       chromeos::system::StatisticsProvider::GetInstance();
-  provider->GetMachineFlag(chromeos::kOemKeyboardDrivenOobeKey,
+  provider->GetMachineFlag(chrome::kOemKeyboardDrivenOobeKey,
                            &enable_keyboard_flow);
   if (enable_keyboard_flow)
     CallJS("cr.ui.Oobe.enableKeyboardFlow", enable_keyboard_flow);
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 54a6969..f3e786a 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -41,7 +41,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
-#include "chromeos/chromeos_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/browser_resources.h"
@@ -346,7 +345,7 @@ void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
 
   bool keyboard_driven_oobe = false;
   system::StatisticsProvider::GetInstance()->GetMachineFlag(
-      chromeos::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe);
+      chrome::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe);
   localized_strings->SetString("highlightStrength",
                                keyboard_driven_oobe ? "strong" : "normal");
 }
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index af00049..61bb92a 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -126,6 +126,8 @@
         'browser/chromeos/app_mode/kiosk_app_manager_observer.h',
         'browser/chromeos/app_mode/kiosk_app_update_service.cc',
         'browser/chromeos/app_mode/kiosk_app_update_service.h',
+        'browser/chromeos/app_mode/kiosk_oem_manifest_parser.cc',
+        'browser/chromeos/app_mode/kiosk_oem_manifest_parser.h',
         'browser/chromeos/app_mode/startup_app_launcher.cc',
         'browser/chromeos/app_mode/startup_app_launcher.h',
         'browser/chromeos/attestation/attestation_ca_client.cc',
@@ -706,6 +708,8 @@
         'browser/chromeos/system/automatic_reboot_manager.h',
         'browser/chromeos/system/input_device_settings.cc',
         'browser/chromeos/system/input_device_settings.h',
+        'browser/chromeos/system/name_value_pairs_parser.cc',
+        'browser/chromeos/system/name_value_pairs_parser.h',
         'browser/chromeos/system/pointer_device_observer.cc',
         'browser/chromeos/system/pointer_device_observer.h',
         'browser/chromeos/system/statistics_provider.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index a71e6cb..4de7f69 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -541,6 +541,7 @@
         'browser/chrome_page_zoom_unittest.cc',
         'browser/chrome_process_singleton_win_unittest.cc',
         'browser/chromeos/accessibility/magnification_manager_unittest.cc',
+        'browser/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc',
         'browser/chromeos/attestation/attestation_ca_client_unittest.cc',
         'browser/chromeos/attestation/attestation_policy_observer_unittest.cc',
         'browser/chromeos/contacts/contact_database_unittest.cc',
@@ -663,6 +664,7 @@
         'browser/chromeos/status/network_menu_icon.cc',
         'browser/chromeos/status/network_menu_icon_unittest.cc',
         'browser/chromeos/system/automatic_reboot_manager_unittest.cc',
+        'browser/chromeos/system/name_value_pairs_parser_unittest.cc',
         'browser/chromeos/system_logs/lsb_release_log_source_unittest.cc',
         'browser/chromeos/version_loader_unittest.cc',
         'browser/chromeos/web_socket_proxy_helper_unittest.cc',
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 2fd39d7..d10d18a 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -210,6 +210,14 @@ const base::FilePath::CharType kPepperFlashPluginFilename[] =
 // directory names
 const wchar_t kUserDataDirname[] = L"User Data";
 
+#if defined(OS_CHROMEOS)
+const base::FilePath::CharType kDriveCacheDirname[] = FPL("GCache");
+const char kOemDeviceRequisitionKey[] = "oem_device_requisition";
+const char kOemIsEnterpriseManagedKey[] = "oem_enterprise_managed";
+const char kOemCanExitEnterpriseEnrollmentKey[] = "oem_can_exit_enrollment";
+const char kOemKeyboardDrivenOobeKey[] = "oem_keyboard_driven_oobe";
+#endif  // defined(OS_CHROMEOS)
+
 // We don't enable record mode in the released product because users could
 // potentially be tricked into running a product in record mode without
 // knowing it.  Enable in debug builds.  Playback mode is allowed always,
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index 513ea8d..0730cca 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -93,6 +93,14 @@ extern const base::FilePath::CharType kPepperFlashPluginFilename[];
 // directory names
 extern const wchar_t kUserDataDirname[];
 
+#if defined(OS_CHROMEOS)
+extern const base::FilePath::CharType kDriveCacheDirname[];
+extern const char kOemDeviceRequisitionKey[];
+extern const char kOemIsEnterpriseManagedKey[];
+extern const char kOemCanExitEnterpriseEnrollmentKey[];
+extern const char kOemKeyboardDrivenOobeKey[];
+#endif  // defined(OS_CHROMEOS)
+
 extern const bool kRecordModeEnabled;
 
 // The language code used when the language of a page could not be detected.
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 62a276a..251bbfe 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -30,8 +30,6 @@
         'CHROMEOS_IMPLEMENTATION',
       ],
       'sources': [
-        'app_mode/kiosk_oem_manifest_parser.cc',
-        'app_mode/kiosk_oem_manifest_parser.h',
         'audio/audio_device.cc',
         'audio/audio_device.h',
         'audio/audio_pref_observer.h',
@@ -46,8 +44,6 @@
         'attestation/attestation_constants.h',
         'attestation/attestation_flow.cc',
         'attestation/attestation_flow.h',
-        'chromeos_constants.cc',
-        'chromeos_constants.h',
         'chromeos_export.h',
         'chromeos_paths.cc',
         'chromeos_paths.h',
@@ -296,8 +292,6 @@
         'process_proxy/process_proxy.h',
         'process_proxy/process_proxy_registry.cc',
         'process_proxy/process_proxy_registry.h',
-        'system/name_value_pairs_parser.cc',
-        'system/name_value_pairs_parser.h',
       ],
       'conditions': [
         ['use_x11 == 1', {
@@ -472,7 +466,6 @@
       ],
       'sources': [
         'attestation/attestation_flow_unittest.cc',
-        'app_mode/kiosk_oem_manifest_parser_unittest.cc',
         'display/output_configurator_unittest.cc',
         'dbus/blocking_method_caller_unittest.cc',
         'dbus/power_policy_controller_unittest.cc',
@@ -525,7 +518,6 @@
         'network/shill_property_handler_unittest.cc',
         'process_proxy/process_output_watcher_unittest.cc',
         'process_proxy/process_proxy_unittest.cc',
-        'system/name_value_pairs_parser_unittest.cc',
       ],
       'include_dirs': [
         '..',
diff --git a/chromeos/chromeos_constants.cc b/chromeos/chromeos_constants.cc
deleted file mode 100644
index fb2b8a3..0000000
--- a/chromeos/chromeos_constants.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chromeos/chromeos_constants.h"
-
-#define FPL FILE_PATH_LITERAL
-
-namespace chromeos {
-
-const base::FilePath::CharType kDriveCacheDirname[] = FPL("GCache");
-const char kOemDeviceRequisitionKey[] = "oem_device_requisition";
-const char kOemIsEnterpriseManagedKey[] = "oem_enterprise_managed";
-const char kOemCanExitEnterpriseEnrollmentKey[] = "oem_can_exit_enrollment";
-const char kOemKeyboardDrivenOobeKey[] = "oem_keyboard_driven_oobe";
-
-}  // namespace chromeos
diff --git a/chromeos/chromeos_constants.h b/chromeos/chromeos_constants.h
deleted file mode 100644
index 48e0e9df..0000000
--- a/chromeos/chromeos_constants.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Constants related to ChromeOS.
-
-#ifndef CHROMEOS_CHROMEOS_CONSTANTS_H_
-#define CHROMEOS_CHROMEOS_CONSTANTS_H_
-
-#include "base/files/file_path.h"
-#include "chromeos/chromeos_export.h"
-
-namespace chromeos {
-
-CHROMEOS_EXPORT extern const base::FilePath::CharType kDriveCacheDirname[];
-CHROMEOS_EXPORT extern const char kOemDeviceRequisitionKey[];
-CHROMEOS_EXPORT extern const char kOemIsEnterpriseManagedKey[];
-CHROMEOS_EXPORT extern const char kOemCanExitEnterpriseEnrollmentKey[];
-CHROMEOS_EXPORT extern const char kOemKeyboardDrivenOobeKey[];
-
-}  // namespace chromeos
-
-#endif  // CHROMEOS_CHROMEOS_CONSTANTS_H_
diff --git a/chromeos/test/data/app_mode/kiosk_manifest/kiosk_manifest.json b/chromeos/test/data/app_mode/kiosk_manifest/kiosk_manifest.json
deleted file mode 100644
index a3f5c562..0000000
--- a/chromeos/test/data/app_mode/kiosk_manifest/kiosk_manifest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "enterprise_managed": true,
-  "can_exit_enrollment": false,
-  "keyboard_driven_oobe": true,
-  "device_requisition": "test"
-}