Split SystemAccess into TimezoneSettings, StatisticsProvider, and SyslogsProvider.

chrome/browser/ui/webui/chromeos/system_info_ui.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/ui/webui/chromeos/system_info_ui.h"
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/system_access.h"
+#include "chrome/browser/chromeos/system/syslogs_provider.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 12 matching lines @@
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
   }
 
  private:
   ~SystemInfoUIHTMLSource() {}
 
-  void SyslogsComplete(chromeos::LogDictionaryType* sys_info,
+  void SyslogsComplete(chromeos::system::LogDictionaryType* sys_info,
                        std::string* ignored_content);
 
   CancelableRequestConsumer consumer_;
 
   // Stored data from StartDataRequest()
   std::string path_;
   int request_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemInfoUIHTMLSource);
 };
@@ skipping 23 matching lines @@
     : DataSource(chrome::kChromeUISystemInfoHost, MessageLoop::current()),
       request_id_(0) {
 }
 
 void SystemInfoUIHTMLSource::StartDataRequest(const std::string& path,
                                               bool is_incognito,
                                               int request_id) {
   path_ = path;
   request_id_ = request_id;
 
-  chromeos::SystemAccess* system_access =
-      chromeos::SystemAccess::GetInstance();
-  if (system_access) {
-    system_access->RequestSyslogs(
+  chromeos::system::SyslogsProvider* provider =
+      chromeos::system::SyslogsProvider::GetInstance();
+  if (provider) {
+    provider->RequestSyslogs(
         false,  // don't compress.
-        chromeos::SystemAccess::SYSLOGS_SYSINFO,
+        chromeos::system::SyslogsProvider::SYSLOGS_SYSINFO,
         &consumer_,
         NewCallback(this, &SystemInfoUIHTMLSource::SyslogsComplete));
   }
 }
 
 void SystemInfoUIHTMLSource::SyslogsComplete(
-    chromeos::LogDictionaryType* sys_info,
+    chromeos::system::LogDictionaryType* sys_info,
     std::string* ignored_content) {
   DCHECK(!ignored_content);
 
   DictionaryValue strings;
   strings.SetString("title", l10n_util::GetStringUTF16(IDS_ABOUT_SYS_TITLE));
   strings.SetString("description",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_DESC));
   strings.SetString("table_title",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_TABLE_TITLE));
   strings.SetString("expand_all_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND_ALL));
   strings.SetString("collapse_all_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE_ALL));
   strings.SetString("expand_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND));
   strings.SetString("collapse_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE));
   SetFontAndTextDirection(&strings);
 
   if (sys_info) {
      ListValue* details = new ListValue();
      strings.Set("details", details);
-     chromeos::LogDictionaryType::iterator it;
+     chromeos::system::LogDictionaryType::iterator it;
      for (it = sys_info->begin(); it != sys_info->end(); ++it) {
        DictionaryValue* val = new DictionaryValue;
        val->SetString("stat_name", it->first);
        val->SetString("stat_value", it->second);
        details->Append(val);
      }
      strings.SetString("anchor", path_);
      delete sys_info;
   }
   static const base::StringPiece systeminfo_html(
@@ skipping 36 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 SystemInfoUI::SystemInfoUI(TabContents* contents) : ChromeWebUI(contents) {
   SystemInfoHandler* handler = new SystemInfoHandler();
   AddMessageHandler((handler)->Attach(this));
   SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource();
 
   // Set up the chrome://system/ source.
   contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }