Split SystemAccess into TimezoneSettings, StatisticsProvider, and SyslogsProvider.

chrome/browser/chromeos/customization_document.cc

 // Copyright (c) 2011 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/customization_document.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/chromeos/system_access.h"
+#include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/browser/browser_thread.h"
 
 // Manifest attributes names.
 
 namespace {
 
 const char kVersionAttr[] = "version";
 const char kDefaultAttr[] = "default";
@@ skipping 110 matching lines @@
 
 // StartupCustomizationDocument implementation. --------------------------------
 
 StartupCustomizationDocument::StartupCustomizationDocument() {
   {
     // Loading manifest causes us to do blocking IO on UI thread.
     // Temporarily allow it until we fix http://crosbug.com/11103
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     LoadManifestFromFile(FilePath(kStartupCustomizationManifestPath));
   }
-  Init(SystemAccess::GetInstance());
+  Init(chromeos::system::StatisticsProvider::GetInstance());
 }
 
 StartupCustomizationDocument::StartupCustomizationDocument(
-    SystemAccess* system_access, const std::string& manifest) {
+    chromeos::system::StatisticsProvider* statistics_provider,
+    const std::string& manifest) {
   LoadManifestFromString(manifest);
-  Init(system_access);
+  Init(statistics_provider);
 }
 
 StartupCustomizationDocument::~StartupCustomizationDocument() {}
 
 StartupCustomizationDocument* StartupCustomizationDocument::GetInstance() {
   return Singleton<StartupCustomizationDocument,
       DefaultSingletonTraits<StartupCustomizationDocument> >::get();
 }
 
-void StartupCustomizationDocument::Init(SystemAccess* system_access) {
+void StartupCustomizationDocument::Init(
+    chromeos::system::StatisticsProvider* statistics_provider) {
   if (!IsReady())
     return;
 
   root_->GetString(kInitialLocaleAttr, &initial_locale_);
   root_->GetString(kInitialTimezoneAttr, &initial_timezone_);
   root_->GetString(kKeyboardLayoutAttr, &keyboard_layout_);
   root_->GetString(kRegistrationUrlAttr, &registration_url_);
 
   std::string hwid;
-  if (system_access->GetMachineStatistic(kHardwareClass, &hwid)) {
+  if (statistics_provider->GetMachineStatistic(kHardwareClass, &hwid)) {
     ListValue* hwid_list = NULL;
     if (root_->GetList(kHwidMapAttr, &hwid_list)) {
       for (size_t i = 0; i < hwid_list->GetSize(); ++i) {
         DictionaryValue* hwid_dictionary = NULL;
         std::string hwid_mask;
         if (hwid_list->GetDictionary(i, &hwid_dictionary) &&
             hwid_dictionary->GetString(kHwidMaskAttr, &hwid_mask)) {
           if (MatchPattern(hwid, hwid_mask)) {
             // If HWID for this machine matches some mask, use HWID specific
             // settings.
@@ skipping 10 matching lines @@
           // Don't break here to allow other entires to be applied if match.
         } else {
           LOG(ERROR) << "Syntax error in customization manifest";
         }
       }
     }
   } else {
     LOG(ERROR) << "HWID is missing in machine statistics";
   }
 
-  system_access->GetMachineStatistic(kInitialLocaleAttr, &initial_locale_);
-  system_access->GetMachineStatistic(kInitialTimezoneAttr, &initial_timezone_);
-  system_access->GetMachineStatistic(kKeyboardLayoutAttr, &keyboard_layout_);
+  statistics_provider->GetMachineStatistic(kInitialLocaleAttr,
+                                           &initial_locale_);
+  statistics_provider->GetMachineStatistic(kInitialTimezoneAttr,
+                                           &initial_timezone_);
+  statistics_provider->GetMachineStatistic(kKeyboardLayoutAttr,
+                                           &keyboard_layout_);
 }
 
 std::string StartupCustomizationDocument::GetHelpPage(
     const std::string& locale) const {
   return GetLocaleSpecificString(locale, kSetupContentAttr, kHelpPageAttr);
 }
 
 std::string StartupCustomizationDocument::GetEULAPage(
     const std::string& locale) const {
   return GetLocaleSpecificString(locale, kSetupContentAttr, kEulaPageAttr);
@@ skipping 185 matching lines @@
      DictionaryValue* carrier_deal = NULL;
      if (carriers->GetDictionary(*iter, &carrier_deal)) {
        carrier_deals_[*iter] = new CarrierDeal(carrier_deal);
      }
    }
   }
   return true;
 }
 
 }  // namespace chromeos