Split SystemAccess into TimezoneSettings, StatisticsProvider, and SyslogsProvider.

chrome/browser/ui/webui/bug_report_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/bug_report_ui.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 26 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/system_access.h"
+#include "chrome/browser/chromeos/system/syslogs_provider.h"
 #endif
 
 namespace {
 
 const char kScreenshotBaseUrl[] = "chrome://screenshots/";
 const char kCurrentScreenshotUrl[] = "chrome://screenshots/current";
 #if defined(OS_CHROMEOS)
 const char kSavedScreenshotsUrl[] = "chrome://screenshots/saved/";
 
 const char kScreenshotPattern[] = "*.png";
@@ skipping 158 matching lines @@
 
   void CancelFeedbackCollection();
   void CloseFeedbackTab();
 
   TabContents* tab_;
   ScreenshotSource* screenshot_source_;
 
   BugReportData* bug_report_;
   std::string target_tab_url_;
 #if defined(OS_CHROMEOS)
-  // Variables to track SystemAccess::RequestSyslogs callback.
-  chromeos::SystemAccess::Handle syslogs_handle_;
+  // Variables to track SyslogsProvider::RequestSyslogs callback.
+  chromeos::system::SyslogsProvider::Handle syslogs_handle_;
   CancelableRequestConsumer syslogs_consumer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BugReportHandler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BugReportHTMLSource
 //
@@ skipping 321 matching lines @@
   // 0: current url
   if (target_tab_url_.length())
     dialog_defaults.Append(new StringValue(target_tab_url_));
   else
     dialog_defaults.Append(new StringValue(""));
 
 #if defined(OS_CHROMEOS)
   // 1: about:system
   dialog_defaults.Append(new StringValue(chrome::kChromeUISystemInfoURL));
   // Trigger the request for system information here.
-  chromeos::SystemAccess* system_access =
-      chromeos::SystemAccess::GetInstance();
-  if (system_access) {
-    syslogs_handle_ = system_access->RequestSyslogs(
+  chromeos::system::SyslogsProvider* provider =
+      chromeos::system::SyslogsProvider::GetInstance();
+  if (provider) {
+    syslogs_handle_ = provider->RequestSyslogs(
         true,  // don't compress.
-        chromeos::SystemAccess::SYSLOGS_FEEDBACK,
+        chromeos::system::SyslogsProvider::SYSLOGS_FEEDBACK,
         &syslogs_consumer_,
         NewCallback(bug_report_, &BugReportData::SyslogsComplete));
   }
   // 2: user e-mail
   dialog_defaults.Append(new StringValue(GetUserEmail()));
 #endif
 
   web_ui_->CallJavascriptFunction("setupDialogDefaults", dialog_defaults);
 }
 
@@ skipping 133 matching lines @@
 
 void BugReportHandler::HandleOpenSystemTab(const ListValue* args) {
 #if defined(OS_CHROMEOS)
   BrowserList::GetLastActive()->OpenSystemTabAndActivate();
 #endif
 }
 
 void BugReportHandler::CancelFeedbackCollection() {
 #if defined(OS_CHROMEOS)
   if (syslogs_handle_ != 0) {
-    chromeos::SystemAccess* system_access =
-        chromeos::SystemAccess::GetInstance();
-    if (system_access)
-      system_access->CancelRequest(syslogs_handle_);
+    chromeos::system::SyslogsProvider* provider =
+        chromeos::system::SyslogsProvider::GetInstance();
+    if (provider)
+      provider->CancelRequest(syslogs_handle_);
   }
 #endif
 }
 
 void BugReportHandler::CloseFeedbackTab() {
   ClobberScreenshotsSource();
 
   Browser* browser = BrowserList::GetLastActive();
   if (browser) {
     browser->CloseTabContents(tab_);
@@ skipping 11 matching lines @@
   BugReportHandler* handler = new BugReportHandler(tab);
   AddMessageHandler((handler)->Attach(this));
 
   // The handler's init will specify which html
   // resource we'll display to the user
   BugReportUIHTMLSource* html_source =
       new BugReportUIHTMLSource(handler->Init());
   // Set up the chrome://bugreport/ source.
   tab->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }