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

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

 // Copyright (c) 2012 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 "chrome/browser/chromeos/system/statistics_provider.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #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;
 
 namespace chromeos {
 namespace system {
 namespace {
 
 // Path to the tool used to get system info, and delimiters for the output
 // format of the tool.
@@ skipping 209 matching lines @@
   on_statistics_loaded_.Signal();
   VLOG(1) << "Finished loading statistics";
 }
 
 void StatisticsProviderImpl::LoadOemManifestFromFile(
     const base::FilePath& file) {
   KioskOemManifestParser::Manifest oem_manifest;
   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;
 }
 
 StatisticsProviderImpl* StatisticsProviderImpl::GetInstance() {
   return Singleton<StatisticsProviderImpl,
                    DefaultSingletonTraits<StatisticsProviderImpl> >::get();
 }
 
 // The stub StatisticsProvider implementation used on Linux desktop.
 class StatisticsProviderStubImpl : public StatisticsProviderImpl {
@@ skipping 48 matching lines @@
 StatisticsProvider* StatisticsProvider::GetInstance() {
   if (base::chromeos::IsRunningOnChromeOS()) {
     return StatisticsProviderImpl::GetInstance();
   } else {
     return StatisticsProviderStubImpl::GetInstance();
   }
 }
 
 }  // namespace system
 }  // namespace chromeos