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

trunk/src/chrome/browser/chromeos/system/statistics_provider.cc

Index: trunk/src/chrome/browser/chromeos/system/statistics_provider.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/system/statistics_provider.cc	(revision 197968)
+++ trunk/src/chrome/browser/chromeos/system/statistics_provider.cc	(working copy)
@@ -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 @@
   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;
 }