Enable gathering and sending system logs for Desktop Chrome.

Currently the system log gathering code is only limited to ChromeOS. Move the code out of ChromeOS so it can be used by regular Chrome.
The code has been refactored to leave the ChromeOS specific logs gathering code under the c/b/chromeos directory while moving the general system logs code under the c/b/feedback directory. We didn't move system_logs directory under c/b/ since system logs are mostly related with feedback and to keep the c/b/ clutter low.

Individual developers can add their own additional logs for Chrome under c/b/feedback/system_logs/log_sources following the *_log_source.* templates already there.

R=asargent@chromium.org, xiyuan@chromium.org
BUG=306532

Review URL: https://codereview.chromium.org/105873004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241477 0039d316-1c4b-4281-b951-d872f2087c98

40 files changed, 258 insertions, 284 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 7dfb9b7..f592d0f 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -86,6 +86,7 @@
       <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="BINDATA" />
       <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="BINDATA" />
+      <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" type="BINDATA" />
       <include name="IDR_ABOUT_VERSION_CSS" file="resources\about_version.css" type="BINDATA" />
       <if expr="is_android">
@@ -300,7 +301,6 @@
       <include name="IDR_GAIA_AUTH_SAML_MANIFEST" file="resources\gaia_auth\manifest_saml.json" type="BINDATA" />
       <include name="IDR_GAIA_AUTH_INLINE_MANIFEST" file="resources\gaia_auth\manifest_inline.json" type="BINDATA" />
       <if expr="pp_ifdef('chromeos')">
-        <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_BACKLOADER_MANIFEST" file="resources\backloader\manifest.json" type="BINDATA" />
         <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
         <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\choose_mobile_network.js" type="BINDATA" />
diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.cc b/chrome/browser/chromeos/system_logs/command_line_log_source.cc
index 84d5fbc..f248358 100644
--- a/chrome/browser/chromeos/system_logs/command_line_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/command_line_log_source.cc
@@ -19,7 +19,7 @@ using content::BrowserThread;
 namespace {
 
 // Gathers log data from various scripts/programs.
-void ExecuteCommandLines(chromeos::SystemLogsResponse* response) {
+void ExecuteCommandLines(system_logs::SystemLogsResponse* response) {
   // TODO(tudalex): Move program calling in a array or something similar to make
   // it more easier to modify and understand.
   std::vector<std::pair<std::string, CommandLine> > commands;
@@ -77,7 +77,7 @@ void ExecuteCommandLines(chromeos::SystemLogsResponse* response) {
 
 }  // namespace
 
-namespace chromeos {
+namespace system_logs {
 
 void CommandLineLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -90,4 +90,4 @@ void CommandLineLogSource::Fetch(const SysLogsSourceCallback& callback) {
       base::Bind(callback, base::Owned(response)));
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.h b/chrome/browser/chromeos/system_logs/command_line_log_source.h
index 4dc9a98..a4ad5c7 100644
--- a/chrome/browser/chromeos/system_logs/command_line_log_source.h
+++ b/chrome/browser/chromeos/system_logs/command_line_log_source.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_COMMAND_LINE_LOG_SOURCE_H_
 #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_COMMAND_LINE_LOG_SOURCE_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // This classs gathers logs data from various command line tools which we can
 // not access using Debug Daemon.
@@ -23,6 +23,6 @@ class CommandLineLogSource : public SystemLogsSource {
   DISALLOW_COPY_AND_ASSIGN(CommandLineLogSource);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_COMMAND_LINE_LOG_SOURCE_H_
diff --git a/chrome/browser/chromeos/system_logs/dbus_log_source.cc b/chrome/browser/chromeos/system_logs/dbus_log_source.cc
index 861f724..57d97e8 100644
--- a/chrome/browser/chromeos/system_logs/dbus_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/dbus_log_source.cc
@@ -10,7 +10,7 @@
 const char kDBusLogEntryShort[] = "dbus_summary";
 const char kDBusLogEntryLong[] = "dbus_details";
 
-namespace chromeos {
+namespace system_logs {
 
 void DBusLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ -26,4 +26,4 @@ void DBusLogSource::Fetch(const SysLogsSourceCallback& callback) {
   callback.Run(&response);
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/dbus_log_source.h b/chrome/browser/chromeos/system_logs/dbus_log_source.h
index 622aa56..b244046 100644
--- a/chrome/browser/chromeos/system_logs/dbus_log_source.h
+++ b/chrome/browser/chromeos/system_logs/dbus_log_source.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DBUS_LOG_SOURCE_H_
 #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DBUS_LOG_SOURCE_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // Fetches memory usage details.
 class DBusLogSource : public SystemLogsSource {
@@ -22,6 +22,6 @@ class DBusLogSource : public SystemLogsSource {
   DISALLOW_COPY_AND_ASSIGN(DBusLogSource);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DBUS_LOG_SOURCE_H_
diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
index c3a3368..eb72f83 100644
--- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
@@ -25,7 +25,7 @@ const char kModemStatusKeyName[] = "modem-status";
 const char kWiMaxStatusKeyName[] = "wimax-status";
 const char kUserLogFileKeyName[] = "user_log_files";
 
-namespace chromeos {
+namespace system_logs {
 
 DebugDaemonLogSource::DebugDaemonLogSource(bool scrub)
     : response_(new SystemLogsResponse()),
@@ -41,7 +41,8 @@ void DebugDaemonLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK(callback_.is_null());
 
   callback_ = callback;
-  DebugDaemonClient* client = DBusThreadManager::Get()->GetDebugDaemonClient();
+  chromeos::DebugDaemonClient* client =
+      chromeos::DBusThreadManager::Get()->GetDebugDaemonClient();
 
   client->GetRoutes(true,   // Numeric
                     false,  // No IPv6
@@ -188,4 +189,4 @@ void DebugDaemonLogSource::RequestCompleted() {
   callback_.Run(response_.get());
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h
index a842379..f1c5728 100644
--- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h
+++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h
@@ -10,11 +10,11 @@
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
 class Profile;
 
-namespace chromeos {
+namespace system_logs {
 
 // Gathers log data from Debug Daemon.
 class DebugDaemonLogSource : public SystemLogsSource {
@@ -65,6 +65,6 @@ class DebugDaemonLogSource : public SystemLogsSource {
 };
 
 
-}  // namespace chromeos
+}  // namespace system_logs
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DEBUG_DAEMON_LOG_SOURCE_H_
diff --git a/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc b/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc
index 789673a..e93186e 100644
--- a/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc
@@ -7,7 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/sys_info.h"
 
-namespace chromeos {
+namespace system_logs {
 
 void LsbReleaseLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK(!callback.is_null());
@@ -21,4 +21,4 @@ void LsbReleaseLogSource::Fetch(const SysLogsSourceCallback& callback) {
   callback.Run(response.get());
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/lsb_release_log_source.h b/chrome/browser/chromeos/system_logs/lsb_release_log_source.h
index 29a071a..c68db1d 100644
--- a/chrome/browser/chromeos/system_logs/lsb_release_log_source.h
+++ b/chrome/browser/chromeos/system_logs/lsb_release_log_source.h
@@ -4,9 +4,9 @@
 #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_LSB_RELEASE_LOG_SOURCE_H_
 #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_LSB_RELEASE_LOG_SOURCE_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // Fetches release information form /etc/lsb-release file.
 class LsbReleaseLogSource : public SystemLogsSource {
@@ -21,6 +21,6 @@ class LsbReleaseLogSource : public SystemLogsSource {
   DISALLOW_COPY_AND_ASSIGN(LsbReleaseLogSource);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_LSB_RELEASE_LOG_SOURCE_H_
diff --git a/chrome/browser/chromeos/system_logs/network_event_log_source.cc b/chrome/browser/chromeos/system_logs/network_event_log_source.cc
index 56fd82e..3226b30 100644
--- a/chrome/browser/chromeos/system_logs/network_event_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/network_event_log_source.cc
@@ -8,7 +8,7 @@
 #include "chromeos/network/network_event_log.h"
 #include "content/public/browser/browser_thread.h"
 
-namespace chromeos {
+namespace system_logs {
 
 const char kNetworkEventLogEntry[] = "network_event_log";
 
@@ -18,12 +18,13 @@ void NetworkEventLogSource::Fetch(const SysLogsSourceCallback& callback) {
 
   scoped_ptr<SystemLogsResponse> response(new SystemLogsResponse);
   const int kMaxNetworkEventsForAboutSystem = 400;
-  (*response)[kNetworkEventLogEntry] = network_event_log::GetAsString(
-      network_event_log::OLDEST_FIRST,
-      "time,file,desc",
-      network_event_log::kDefaultLogLevel,
-      kMaxNetworkEventsForAboutSystem);
+  (*response)[kNetworkEventLogEntry] =
+      chromeos::network_event_log::GetAsString(
+          chromeos::network_event_log::OLDEST_FIRST,
+          "time,file,desc",
+          chromeos::network_event_log::kDefaultLogLevel,
+          kMaxNetworkEventsForAboutSystem);
   callback.Run(response.get());
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/network_event_log_source.h b/chrome/browser/chromeos/system_logs/network_event_log_source.h
index 6df6e9a..35309f6 100644
--- a/chrome/browser/chromeos/system_logs/network_event_log_source.h
+++ b/chrome/browser/chromeos/system_logs/network_event_log_source.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_NETWORK_EVENT_LOG_SOURCE_H_
 #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_NETWORK_EVENT_LOG_SOURCE_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // Fetches memory usage details.
 class NetworkEventLogSource : public SystemLogsSource {
@@ -22,6 +22,6 @@ class NetworkEventLogSource : public SystemLogsSource {
   DISALLOW_COPY_AND_ASSIGN(NetworkEventLogSource);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_NETWORK_EVENT_LOG_SOURCE_H_
diff --git a/chrome/browser/chromeos/system_logs/touch_log_source.cc b/chrome/browser/chromeos/system_logs/touch_log_source.cc
index 59e000d..307dd0d 100644
--- a/chrome/browser/chromeos/system_logs/touch_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/touch_log_source.cc
@@ -18,7 +18,7 @@ namespace {
 
 const char kHUDLogDataKey[] = "hud_log";
 
-void GetTouchLogs(chromeos::SystemLogsResponse* response) {
+void GetTouchLogs(system_logs::SystemLogsResponse* response) {
   scoped_ptr<DictionaryValue> dictionary =
       ash::internal::TouchHudDebug::GetAllAsDictionary();
   if (!dictionary->empty()) {
@@ -53,7 +53,7 @@ void GetTouchLogs(chromeos::SystemLogsResponse* response) {
 
 }  // namespace
 
-namespace chromeos {
+namespace system_logs {
 
 TouchLogSource::TouchLogSource() {
 }
@@ -72,4 +72,4 @@ void TouchLogSource::Fetch(const SysLogsSourceCallback& callback) {
       base::Bind(callback, base::Owned(response)));
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/touch_log_source.h b/chrome/browser/chromeos/system_logs/touch_log_source.h
index 42465d3..7102f93 100644
--- a/chrome/browser/chromeos/system_logs/touch_log_source.h
+++ b/chrome/browser/chromeos/system_logs/touch_log_source.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_TOUCH_LOG_SOURCE_H_
 #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_TOUCH_LOG_SOURCE_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 class TouchLogSource : public SystemLogsSource {
  public:
@@ -21,6 +21,6 @@ class TouchLogSource : public SystemLogsSource {
   DISALLOW_COPY_AND_ASSIGN(TouchLogSource);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_TOUCH_LOG_SOURCE_H_
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
index c8698d4..fbc1dea 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
@@ -107,8 +107,12 @@ bool FeedbackPrivateGetStringsFunction::RunImpl() {
   SET_STRING("page-url", IDS_FEEDBACK_REPORT_URL_LABEL);
   SET_STRING("screenshot", IDS_FEEDBACK_SCREENSHOT_LABEL);
   SET_STRING("user-email", IDS_FEEDBACK_USER_EMAIL_LABEL);
+#if defined(OS_CHROMEOS)
   SET_STRING("sys-info",
              IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX);
+#else
+  SET_STRING("sys-info", IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_CHKBOX);
+#endif
   SET_STRING("attach-file-label", IDS_FEEDBACK_ATTACH_FILE_LABEL);
   SET_STRING("attach-file-note", IDS_FEEDBACK_ATTACH_FILE_NOTE);
   SET_STRING("attach-file-to-big", IDS_FEEDBACK_ATTACH_FILE_TO_BIG);
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.cc b/chrome/browser/extensions/api/feedback_private/feedback_service.cc
index 7e79275..b66831f 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_service.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_service.cc
@@ -12,11 +12,10 @@
 
 using content::BrowserThread;
 
-namespace extensions {
+namespace {
 
-// static
-void FeedbackService::PopulateSystemInfo(
-    SystemInformationList* sys_info_list,
+void PopulateSystemInfo(
+    extensions::SystemInformationList* sys_info_list,
     const std::string& key,
     const std::string& value) {
   base::DictionaryValue sys_info_value;
@@ -29,6 +28,10 @@ void FeedbackService::PopulateSystemInfo(
   sys_info_list->push_back(sys_info);
 }
 
+}  // namespace
+
+namespace extensions {
+
 FeedbackService::FeedbackService() {
 }
 
@@ -81,6 +84,32 @@ void FeedbackService::ScreenshotCallback(scoped_ptr<std::string> data) {
   CompleteSendFeedback();
 }
 
+void FeedbackService::GetSystemInformation(
+    const GetSystemInformationCallback& callback) {
+  system_information_callback_ = callback;
+
+  system_logs::ScrubbedSystemLogsFetcher* fetcher =
+      new system_logs::ScrubbedSystemLogsFetcher();
+  fetcher->Fetch(base::Bind(&FeedbackService::OnSystemLogsFetchComplete,
+                            GetWeakPtr()));
+}
+
+
+void FeedbackService::OnSystemLogsFetchComplete(
+    scoped_ptr<system_logs::SystemLogsResponse> sys_info_map) {
+  SystemInformationList sys_info_list;
+  if (!sys_info_map.get()) {
+    system_information_callback_.Run(sys_info_list);
+    return;
+  }
+
+  for (system_logs::SystemLogsResponse::iterator it = sys_info_map->begin();
+       it != sys_info_map->end(); ++it)
+    PopulateSystemInfo(&sys_info_list, it->first, it->second);
+
+  system_information_callback_.Run(sys_info_list);
+}
+
 void FeedbackService::CompleteSendFeedback() {
   // A particular data collection is considered completed if,
   // a.) The blob URL is invalid - this will either happen because we never had
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.h b/chrome/browser/extensions/api/feedback_private/feedback_service.h
index 04acac4..9886149 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_service.h
+++ b/chrome/browser/extensions/api/feedback_private/feedback_service.h
@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/blob_reader.h"
 #include "chrome/browser/feedback/feedback_data.h"
+#include "chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h"
 #include "chrome/common/extensions/api/feedback_private.h"
 
 class Profile;
@@ -30,28 +31,22 @@ class FeedbackService {
 
   // Creates a platform-specific FeedbackService instance.
   static FeedbackService* CreateInstance();
-  // Convenience method for populating a SystemInformationList structure
-  // with a key/value pair.
-  static void PopulateSystemInfo(SystemInformationList* sys_info_list,
-                                 const std::string& key,
-                                 const std::string& value);
 
   virtual ~FeedbackService();
 
   // Sends a feedback report.
-  virtual void SendFeedback(Profile* profile,
-                            scoped_refptr<FeedbackData> feedback_data,
-                            const SendFeedbackCallback& callback);
+  void SendFeedback(Profile* profile,
+                    scoped_refptr<FeedbackData> feedback_data,
+                    const SendFeedbackCallback& callback);
+
+  // Start to gather system information.
+  // The |callback| will be invoked once the query is completed.
+  void GetSystemInformation(const GetSystemInformationCallback& callback);
 
   // Platform specific methods:
   // Gets the email address of the logged in user.
   virtual std::string GetUserEmail() = 0;
 
-  // Start to gather system information.
-  // The |callback| will be invoked once the query is completed.
-  virtual void GetSystemInformation(
-      const GetSystemInformationCallback& callback) = 0;
-
   // Gets the histograms in JSON.
   virtual void GetHistograms(std::string* histograms) = 0;
 
@@ -69,6 +64,10 @@ class FeedbackService {
   // data object once all the requisite data has been populated.
   void CompleteSendFeedback();
 
+ private:
+  void OnSystemLogsFetchComplete(
+      scoped_ptr<system_logs::SystemLogsResponse> sys_info);
+
   GetSystemInformationCallback system_information_callback_;
   SendFeedbackCallback send_feedback_callback_;
 
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc
index aba5489..9cd6c56 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc
@@ -9,9 +9,6 @@
 #include "base/metrics/statistics_recorder.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/system_logs/scrubbed_system_logs_fetcher.h"
-
-using extensions::api::feedback_private::SystemInformation;
 
 namespace extensions {
 
@@ -23,13 +20,9 @@ class FeedbackServiceImpl
   virtual ~FeedbackServiceImpl();
 
   virtual std::string GetUserEmail() OVERRIDE;
-  virtual void GetSystemInformation(
-      const GetSystemInformationCallback& callback) OVERRIDE;
   virtual void GetHistograms(std::string* histograms) OVERRIDE;
 
  private:
-  void ProcessSystemLogs(scoped_ptr<chromeos::SystemLogsResponse> sys_info);
-
   // Overridden from FeedbackService:
   virtual base::WeakPtr<FeedbackService> GetWeakPtr() OVERRIDE;
 
@@ -54,35 +47,10 @@ std::string FeedbackServiceImpl::GetUserEmail() {
     return manager->GetLoggedInUser()->display_email();
 }
 
-void FeedbackServiceImpl::GetSystemInformation(
-    const GetSystemInformationCallback& callback) {
-  system_information_callback_ = callback;
-
-  chromeos::ScrubbedSystemLogsFetcher* fetcher =
-      new chromeos::ScrubbedSystemLogsFetcher();
-  fetcher->Fetch(base::Bind(&FeedbackServiceImpl::ProcessSystemLogs,
-                            AsWeakPtr()));
-}
-
 void FeedbackServiceImpl::GetHistograms(std::string* histograms) {
   *histograms = base::StatisticsRecorder::ToJSON(std::string());
 }
 
-void FeedbackServiceImpl::ProcessSystemLogs(
-    scoped_ptr<chromeos::SystemLogsResponse> sys_info_map) {
-  SystemInformationList sys_info_list;
-  if (!sys_info_map.get()) {
-    system_information_callback_.Run(sys_info_list);
-    return;
-  }
-
-  for (chromeos::SystemLogsResponse::iterator it = sys_info_map->begin();
-       it != sys_info_map->end(); ++it)
-    FeedbackService::PopulateSystemInfo(&sys_info_list, it->first, it->second);
-
-  system_information_callback_.Run(sys_info_list);
-}
-
 base::WeakPtr<FeedbackService> FeedbackServiceImpl::GetWeakPtr() {
   return AsWeakPtr();
 }
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc b/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc
index ff8a007..9e87aaa 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc
@@ -6,21 +6,10 @@
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "base/sys_info.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/common/chrome_version_info.h"
-
-using extensions::api::feedback_private::SystemInformation;
-
-namespace {
-
-const char kChromeVersionTag[] = "CHROME VERSION";
-const char kOsVersionTag[] = "OS VERSION";
-
-}
 
 namespace extensions {
 
@@ -32,8 +21,6 @@ class FeedbackServiceImpl
   virtual ~FeedbackServiceImpl();
 
   virtual std::string GetUserEmail() OVERRIDE;
-  virtual void GetSystemInformation(
-      const GetSystemInformationCallback& callback) OVERRIDE;
   virtual void GetHistograms(std::string* histograms) OVERRIDE;
 
  private:
@@ -65,24 +52,6 @@ std::string FeedbackServiceImpl::GetUserEmail() {
   return signin->GetAuthenticatedUsername();
 }
 
-void FeedbackServiceImpl::GetSystemInformation(
-    const GetSystemInformationCallback& callback) {
-  system_information_callback_ = callback;
-
-  SystemInformationList sys_info_list;
-
-  chrome::VersionInfo version_info;
-  FeedbackService::PopulateSystemInfo(
-      &sys_info_list, kChromeVersionTag, version_info.CreateVersionString());
-
-  std::string os_version = base::SysInfo::OperatingSystemName() + ": " +
-                           base::SysInfo::OperatingSystemVersion();
-  FeedbackService::PopulateSystemInfo(
-      &sys_info_list, kOsVersionTag, os_version);
-
-  system_information_callback_.Run(sys_info_list);
-}
-
 void FeedbackServiceImpl::GetHistograms(std::string* histograms) {
 }
 
diff --git a/chrome/browser/extensions/api/log_private/log_private_api.h b/chrome/browser/extensions/api/log_private/log_private_api.h
index 105eff8..1787968 100644
--- a/chrome/browser/extensions/api/log_private/log_private_api.h
+++ b/chrome/browser/extensions/api/log_private/log_private_api.h
@@ -7,9 +7,9 @@
 
 #include <string>
 
-#include "chrome/browser/chromeos/system_logs/about_system_logs_fetcher.h"
 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
 #include "chrome/browser/extensions/api/log_private/log_parser.h"
+#include "chrome/browser/feedback/system_logs/about_system_logs_fetcher.h"
 #include "chrome/common/extensions/api/log_private.h"
 #include "extensions/browser/extension_function.h"
 
@@ -26,7 +26,7 @@ class LogPrivateGetHistoricalFunction : public AsyncExtensionFunction {
   virtual bool RunImpl() OVERRIDE;
 
  private:
-  void OnSystemLogsLoaded(scoped_ptr<chromeos::SystemLogsResponse> sys_info);
+  void OnSystemLogsLoaded(scoped_ptr<system_logs::SystemLogsResponse> sys_info);
 
   scoped_ptr<FilterHandler> filter_handler_;
 
diff --git a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
index 997ae17..fa4701d 100644
--- a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
+++ b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
@@ -11,11 +11,10 @@
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/system_logs/about_system_logs_fetcher.h"
-#include "chrome/browser/chromeos/system_logs/scrubbed_system_logs_fetcher.h"
 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
 #include "chrome/browser/extensions/api/log_private/log_parser.h"
 #include "chrome/browser/extensions/api/log_private/syslog_parser.h"
+#include "chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h"
 #include "chrome/common/extensions/api/log_private.h"
 #include "extensions/browser/extension_function.h"
 
@@ -33,11 +32,10 @@ scoped_ptr<LogParser> CreateLogParser(const std::string& log_type) {
 
 void CollectLogInfo(
     FilterHandler* filter_handler,
-    chromeos::SystemLogsResponse* logs,
+    system_logs::SystemLogsResponse* logs,
     std::vector<linked_ptr<api::log_private::LogEntry> >* output) {
-  for (chromeos::SystemLogsResponse::const_iterator request_it = logs->begin();
-       request_it != logs->end();
-       ++request_it) {
+  for (system_logs::SystemLogsResponse::const_iterator
+      request_it = logs->begin(); request_it != logs->end(); ++request_it) {
     if (!filter_handler->IsValidSource(request_it->first)) {
       continue;
     }
@@ -63,11 +61,11 @@ bool LogPrivateGetHistoricalFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(params.get());
   filter_handler_.reset(new FilterHandler(params->filter));
 
-  chromeos::SystemLogsFetcherBase* fetcher;
+  system_logs::SystemLogsFetcherBase* fetcher;
   if ((params->filter).scrub) {
-    fetcher = new chromeos::ScrubbedSystemLogsFetcher();
+    fetcher = new system_logs::ScrubbedSystemLogsFetcher();
   } else {
-    fetcher = new chromeos::AboutSystemLogsFetcher();
+    fetcher = new system_logs::AboutSystemLogsFetcher();
   }
   fetcher->Fetch(
       base::Bind(&LogPrivateGetHistoricalFunction::OnSystemLogsLoaded, this));
@@ -76,7 +74,7 @@ bool LogPrivateGetHistoricalFunction::RunImpl() {
 }
 
 void LogPrivateGetHistoricalFunction::OnSystemLogsLoaded(
-    scoped_ptr<chromeos::SystemLogsResponse> sys_info) {
+    scoped_ptr<system_logs::SystemLogsResponse> sys_info) {
   std::vector<linked_ptr<api::log_private::LogEntry> > data;
 
   CollectLogInfo(filter_handler_.get(), sys_info.get(), &data);
diff --git a/chrome/browser/feedback/feedback_util.cc b/chrome/browser/feedback/feedback_util.cc
index a6f1263..b6926db 100644
--- a/chrome/browser/feedback/feedback_util.cc
+++ b/chrome/browser/feedback/feedback_util.cc
@@ -49,12 +49,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/shell.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-#endif
-
 namespace {
 
 void DispatchFeedback(Profile* profile, std::string* post_body, int64 delay);
diff --git a/chrome/browser/chromeos/system_logs/about_system_logs_fetcher.cc b/chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc
index e519ddb..b7c7fee 100644
--- a/chrome/browser/chromeos/system_logs/about_system_logs_fetcher.cc
+++ b/chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc
@@ -2,42 +2,48 @@
 // 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_logs/about_system_logs_fetcher.h"
+#include "chrome/browser/feedback/system_logs/about_system_logs_fetcher.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "chrome/browser/chromeos/system_logs/chrome_internal_log_source.h"
+#include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h"
+#include "chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h"
+#include "content/public/browser/browser_thread.h"
+
+#if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system_logs/command_line_log_source.h"
 #include "chrome/browser/chromeos/system_logs/dbus_log_source.h"
 #include "chrome/browser/chromeos/system_logs/debug_daemon_log_source.h"
 #include "chrome/browser/chromeos/system_logs/lsb_release_log_source.h"
-#include "chrome/browser/chromeos/system_logs/memory_details_log_source.h"
 #include "chrome/browser/chromeos/system_logs/network_event_log_source.h"
 #include "chrome/browser/chromeos/system_logs/touch_log_source.h"
-#include "content/public/browser/browser_thread.h"
+#endif
 
 using content::BrowserThread;
 
-namespace chromeos {
+namespace system_logs {
 
 AboutSystemLogsFetcher::AboutSystemLogsFetcher() {
-  // Debug Daemon data source.
-  const bool scrub_data = false;
-  data_sources_.push_back(new DebugDaemonLogSource(scrub_data));
-
-  // Chrome data sources.
   data_sources_.push_back(new ChromeInternalLogSource());
+  data_sources_.push_back(new MemoryDetailsLogSource());
+
+#if defined(OS_CHROMEOS)
   data_sources_.push_back(new CommandLineLogSource());
   data_sources_.push_back(new DBusLogSource());
   data_sources_.push_back(new LsbReleaseLogSource());
-  data_sources_.push_back(new MemoryDetailsLogSource());
   data_sources_.push_back(new NetworkEventLogSource());
   data_sources_.push_back(new TouchLogSource());
 
+  // Debug Daemon data source - currently only this data source supports
+  // the scrub_data parameter.
+  const bool scrub_data = false;
+  data_sources_.push_back(new DebugDaemonLogSource(scrub_data));
+#endif
+
   num_pending_requests_ = data_sources_.size();
 }
 
 AboutSystemLogsFetcher::~AboutSystemLogsFetcher() {
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/about_system_logs_fetcher.h b/chrome/browser/feedback/system_logs/about_system_logs_fetcher.h
index 3c6d9ad..ef84516 100644
--- a/chrome/browser/chromeos/system_logs/about_system_logs_fetcher.h
+++ b/chrome/browser/feedback/system_logs/about_system_logs_fetcher.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_ABOUT_SYSTEM_LOGS_FETCHER_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_ABOUT_SYSTEM_LOGS_FETCHER_H_
+#ifndef CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_ABOUT_SYSTEM_LOGS_FETCHER_H_
+#define CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_ABOUT_SYSTEM_LOGS_FETCHER_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // The AboutAboutSystemLogsFetcher aggregates the unscrubbed logs for display
 // in the about:system page.
@@ -21,7 +21,7 @@ class AboutSystemLogsFetcher : public SystemLogsFetcherBase {
   DISALLOW_COPY_AND_ASSIGN(AboutSystemLogsFetcher);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_ABOUT_SYSTEM_LOGS_FETCHER_H_
+#endif  // CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_ABOUT_SYSTEM_LOGS_FETCHER_H_
 
diff --git a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index dca45b4..f92493f4 100644
--- a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -1,17 +1,18 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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_logs/chrome_internal_log_source.h"
+#include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h"
 
 #include "base/json/json_string_value_serializer.h"
+#include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/about_sync_util.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/ui/webui/crashes_ui.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension.h"
@@ -23,10 +24,13 @@ namespace {
 const char kSyncDataKey[] = "about_sync_data";
 const char kExtensionsListKey[] = "extensions";
 const char kChromeVersionTag[] = "CHROME VERSION";
+#if !defined(OS_CHROMEOS)
+const char kOsVersionTag[] = "OS VERSION";
+#endif
 
 }  // namespace
 
-namespace chromeos {
+namespace system_logs {
 
 void ChromeInternalLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ -37,6 +41,13 @@ void ChromeInternalLogSource::Fetch(const SysLogsSourceCallback& callback) {
   chrome::VersionInfo version_info;
   response[kChromeVersionTag] =  version_info.CreateVersionString();
 
+#if !defined(OS_CHROMEOS)
+  // On ChromeOS, this will be pulled in from the LSB_RELEASE.
+  std::string os_version = base::SysInfo::OperatingSystemName() + ": " +
+                           base::SysInfo::OperatingSystemVersion();
+  response[kOsVersionTag] =  os_version;
+#endif
+
   PopulateSyncLogs(&response);
   PopulateExtensionInfoLogs(&response);
 
@@ -83,10 +94,7 @@ void ChromeInternalLogSource::PopulateSyncLogs(SystemLogsResponse* response) {
 
 void ChromeInternalLogSource::PopulateExtensionInfoLogs(
     SystemLogsResponse* response) {
-  bool reporting_enabled = false;
-  chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
-                                            &reporting_enabled);
-  if (!reporting_enabled)
+  if (!CrashesUI::CrashReportingUIEnabled())
     return;
 
   Profile* primary_profile =
@@ -108,12 +116,14 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
     if (extensions_list.empty()) {
       extensions_list = extension->name();
     } else {
-      extensions_list += ", " + extension->name();
+      extensions_list += ",\n" + extension->name();
     }
   }
+  if (!extensions_list.empty())
+    extensions_list += "\n";
 
   if (!extensions_list.empty())
     (*response)[kExtensionsListKey] = extensions_list;
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.h b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h
index 1aa6546..e6496e7 100644
--- a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.h
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_CHROME_INTERNAL_LOG_SOURCE_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_CHROME_INTERNAL_LOG_SOURCE_H_
+#ifndef CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_LOG_SOURCES_CHROME_INTERNAL_LOG_SOURCE_H_
+#define CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_LOG_SOURCES_CHROME_INTERNAL_LOG_SOURCE_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // Fetches internal Chrome logs.
 class ChromeInternalLogSource : public SystemLogsSource {
@@ -25,6 +25,6 @@ class ChromeInternalLogSource : public SystemLogsSource {
   DISALLOW_COPY_AND_ASSIGN(ChromeInternalLogSource);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_CHROME_INTERNAL_LOG_SOURCE_H_
+#endif  // CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_LOG_SOURCES_CHROME_INTERNAL_LOG_SOURCE_H_
diff --git a/chrome/browser/chromeos/system_logs/memory_details_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.cc
index 6618563..b364a89 100644
--- a/chrome/browser/chromeos/system_logs/memory_details_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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_logs/memory_details_log_source.h"
+#include "chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h"
 
 #include "chrome/browser/memory_details.h"
 #include "content/public/browser/browser_thread.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // Reads Chrome memory usage.
 class SystemLogsMemoryHandler : public MemoryDetails {
@@ -42,4 +42,4 @@ void MemoryDetailsLogSource::Fetch(const SysLogsSourceCallback& callback) {
   handler->StartFetch(MemoryDetails::UPDATE_USER_METRICS);
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/memory_details_log_source.h b/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h
index 777c576509..613a559 100644
--- a/chrome/browser/chromeos/system_logs/memory_details_log_source.h
+++ b/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_MEMORY_DETAILS_LOG_SOURCE_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_MEMORY_DETAILS_LOG_SOURCE_H_
+#ifndef CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_LOG_SOURCES_MEMORY_DETAILS_LOG_SOURCE_H_
+#define CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_LOG_SOURCES_MEMORY_DETAILS_LOG_SOURCE_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // Fetches memory usage details.
 class MemoryDetailsLogSource : public SystemLogsSource {
@@ -22,6 +22,6 @@ class MemoryDetailsLogSource : public SystemLogsSource {
   DISALLOW_COPY_AND_ASSIGN(MemoryDetailsLogSource);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_MEMORY_DETAILS_LOG_SOURCE_H_
+#endif  // CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_LOG_SOURCES_MEMORY_DETAILS_LOG_SOURCE_H_
diff --git a/chrome/browser/chromeos/system_logs/scrubbed_system_logs_fetcher.cc b/chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.cc
index 5845c13..6d09779 100644
--- a/chrome/browser/chromeos/system_logs/scrubbed_system_logs_fetcher.cc
+++ b/chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.cc
@@ -2,42 +2,48 @@
 // 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_logs/scrubbed_system_logs_fetcher.h"
+#include "chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "chrome/browser/chromeos/system_logs/chrome_internal_log_source.h"
+#include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h"
+#include "chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h"
+#include "content/public/browser/browser_thread.h"
+
+#if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system_logs/command_line_log_source.h"
 #include "chrome/browser/chromeos/system_logs/dbus_log_source.h"
 #include "chrome/browser/chromeos/system_logs/debug_daemon_log_source.h"
 #include "chrome/browser/chromeos/system_logs/lsb_release_log_source.h"
-#include "chrome/browser/chromeos/system_logs/memory_details_log_source.h"
 #include "chrome/browser/chromeos/system_logs/network_event_log_source.h"
 #include "chrome/browser/chromeos/system_logs/touch_log_source.h"
-#include "content/public/browser/browser_thread.h"
+#endif
 
 using content::BrowserThread;
 
-namespace chromeos {
+namespace system_logs {
 
 ScrubbedSystemLogsFetcher::ScrubbedSystemLogsFetcher() {
-  // Debug Daemon data source.
-  const bool scrub_data = true;
-  data_sources_.push_back(new DebugDaemonLogSource(scrub_data));
-
-  // Chrome data sources.
   data_sources_.push_back(new ChromeInternalLogSource());
+  data_sources_.push_back(new MemoryDetailsLogSource());
+
+#if defined(OS_CHROMEOS)
   data_sources_.push_back(new CommandLineLogSource());
   data_sources_.push_back(new DBusLogSource());
   data_sources_.push_back(new LsbReleaseLogSource());
-  data_sources_.push_back(new MemoryDetailsLogSource());
   data_sources_.push_back(new NetworkEventLogSource());
   data_sources_.push_back(new TouchLogSource());
 
+  // Debug Daemon data source - currently only this data source supports
+  // the scrub_data parameter.
+  const bool scrub_data = true;
+  data_sources_.push_back(new DebugDaemonLogSource(scrub_data));
+#endif
+
   num_pending_requests_ = data_sources_.size();
 }
 
 ScrubbedSystemLogsFetcher::~ScrubbedSystemLogsFetcher() {
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/scrubbed_system_logs_fetcher.h b/chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h
index 7d47151..19c9077 100644
--- a/chrome/browser/chromeos/system_logs/scrubbed_system_logs_fetcher.h
+++ b/chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_SCRUBBED_SYSTEM_LOGS_FETCHER_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_SCRUBBED_SYSTEM_LOGS_FETCHER_H_
+#ifndef CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_SCRUBBED_SYSTEM_LOGS_FETCHER_H_
+#define CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_SCRUBBED_SYSTEM_LOGS_FETCHER_H_
 
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
-namespace chromeos {
+namespace system_logs {
 
 // The ScrubbedSystemLogsFetcher aggregates the scrubbed logs for sending
 // with feedback reports.
@@ -23,7 +23,7 @@ class ScrubbedSystemLogsFetcher : public SystemLogsFetcherBase {
   DISALLOW_COPY_AND_ASSIGN(ScrubbedSystemLogsFetcher);
 };
 
-}  // namespace chromeos
+}  // namespace system_logs
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_SCRUBBED_SYSTEM_LOGS_FETCHER_H_
+#endif  // CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_SCRUBBED_SYSTEM_LOGS_FETCHER_H_
 
diff --git a/chrome/browser/chromeos/system_logs/system_logs_fetcher_base.cc b/chrome/browser/feedback/system_logs/system_logs_fetcher_base.cc
index 09a177b..ae82af1 100644
--- a/chrome/browser/chromeos/system_logs/system_logs_fetcher_base.cc
+++ b/chrome/browser/feedback/system_logs/system_logs_fetcher_base.cc
@@ -2,23 +2,15 @@
 // 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_logs/system_logs_fetcher_base.h"
+#include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "chrome/browser/chromeos/system_logs/chrome_internal_log_source.h"
-#include "chrome/browser/chromeos/system_logs/command_line_log_source.h"
-#include "chrome/browser/chromeos/system_logs/dbus_log_source.h"
-#include "chrome/browser/chromeos/system_logs/debug_daemon_log_source.h"
-#include "chrome/browser/chromeos/system_logs/lsb_release_log_source.h"
-#include "chrome/browser/chromeos/system_logs/memory_details_log_source.h"
-#include "chrome/browser/chromeos/system_logs/network_event_log_source.h"
-#include "chrome/browser/chromeos/system_logs/touch_log_source.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
-namespace chromeos {
+namespace system_logs {
 
 SystemLogsFetcherBase::SystemLogsFetcherBase()
     : response_(new SystemLogsResponse),
@@ -58,4 +50,4 @@ void SystemLogsFetcherBase::AddResponse(SystemLogsResponse* response) {
   BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this);
 }
 
-}  // namespace chromeos
+}  // namespace system_logs
diff --git a/chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h b/chrome/browser/feedback/system_logs/system_logs_fetcher_base.h
index 986b678..92e98acf 100644
--- a/chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h
+++ b/chrome/browser/feedback/system_logs/system_logs_fetcher_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_SYSTEM_LOGS_FETCHER_BASE_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_SYSTEM_LOGS_FETCHER_BASE_H_
+#ifndef CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_SYSTEM_LOGS_FETCHER_BASE_H_
+#define CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_SYSTEM_LOGS_FETCHER_BASE_H_
 
 #include <map>
 #include <string>
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 
-namespace chromeos {
+namespace system_logs {
 
 typedef std::map<std::string, std::string> SystemLogsResponse;
 
@@ -74,7 +74,6 @@ class SystemLogsFetcherBase
   DISALLOW_COPY_AND_ASSIGN(SystemLogsFetcherBase);
 };
 
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_SYSTEM_LOGS_FETCHER_BASE_H_
+}  // namespace system_logs
 
+#endif  // CHROME_BROWSER_FEEDBACK_SYSTEM_LOGS_SYSTEM_LOGS_FETCHER_BASE_H_
diff --git a/chrome/browser/resources/chromeos/about_sys.css b/chrome/browser/resources/about_sys/about_sys.css
index aca684d..a1c8b27 100644
--- a/chrome/browser/resources/chromeos/about_sys.css
+++ b/chrome/browser/resources/about_sys/about_sys.css
@@ -96,7 +96,6 @@ html[dir='rtl'] #header h1 {
   padding: 0 0.5em;
   padding-top: 0.35em;
   vertical-align: top;
-  white-space: pre;
 }
 
 .list tr td:nth-last-child(1),
@@ -130,6 +129,7 @@ html[dir='rtl'] #header h1 {
 .number-expanded,
 .number-collapsed  {
   text-align: left;
+  text-overflow: ellipsis;
   width: 80%;
 }
 
@@ -148,6 +148,11 @@ tr > *:nth-child(2) {
   background-repeat: no-repeat;
 }
 
+.stat-value {
+  text-overflow: ellipsis;
+  white-space: pre-wrap;
+}
+
 html[dir='rtl'] #details .name {
   background-position-left: auto;
   background-position-right: 5em;
diff --git a/chrome/browser/resources/about_sys/about_sys.html b/chrome/browser/resources/about_sys/about_sys.html
new file mode 100644
index 0000000..16280fb
--- /dev/null
+++ b/chrome/browser/resources/about_sys/about_sys.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<html id="t" i18n-values="dir:textdirection;">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title i18n-content="title"></title>
+
+    <link rel="stylesheet" href="about_sys.css">
+    <script src="chrome://resources/js/util.js"></script>
+    <script src="chrome://resources/js/local_strings.js"></script>
+    <script src="about_sys.js"></script>
+  </head>
+  <body>
+    <div id="header">
+      <h1 i18n-content="title"></h1>
+      <p i18n-content="description"></p>
+    </div>
+    <div id="content">
+      <h2 id="tableTitle" i18n-content="tableTitle"></h2>
+      <div id="anchor" jscontent="anchor"></div>
+      <button id="expandAll" class="global-button" i18n-content="expandAllBtn">
+      </button>
+      <button id="collapseAll" class="global-button"
+          i18n-content="collapseAllBtn"></button>
+      <p id="status"></p>
+      <table class="list" id="details">
+        <tr jsselect="details">
+          <td class="name">
+            <div class="stat-name" jscontent="statName"></div>
+          </td>
+          <td class="button-cell">
+            <button jsvalues="id:statName + '-value-btn'"
+              class="expand-status"></button>
+          </td>
+          <td class="number">
+            <div class="stat-value" jscontent="statValue"
+              jsvalues="id:statName + '-value'"></div>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </body>
+</html>
diff --git a/chrome/browser/resources/chromeos/about_sys.js b/chrome/browser/resources/about_sys/about_sys.js
index 0bc3944..e9ecb4a 100644
--- a/chrome/browser/resources/chromeos/about_sys.js
+++ b/chrome/browser/resources/about_sys/about_sys.js
@@ -75,10 +75,11 @@ function expandAll() {
  */
 function collapseMultiLineStrings() {
   var valueDivs = document.getElementsByClassName('stat-value');
+  var nameDivs = document.getElementsByClassName('stat-name');
   for (var i = 0; i < valueDivs.length; i++) {
     var button = getButtonForValueDiv(valueDivs[i]);
     button.onclick = changeCollapsedStatus;
-    if (valueDivs[i].textContent.split('\n').length > 1) {
+    if (valueDivs[i].scrollHeight > (nameDivs[i].scrollHeight * 2)) {
       button.className = '';
       button.textContent = localStrings.getString('expandBtn');
       valueDivs[i].parentNode.className = 'number-collapsed';
diff --git a/chrome/browser/resources/chromeos/about_sys.html b/chrome/browser/resources/chromeos/about_sys.html
deleted file mode 100644
index 392bd36..0000000
--- a/chrome/browser/resources/chromeos/about_sys.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<html i18n-values="dir:textdirection;"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title i18n-content="title"></title>
-<link rel="stylesheet" href="about_sys.css">
-<script src="chrome://resources/js/util.js"></script>
-<script src="chrome://resources/js/local_strings.js"></script>
-<script src="about_sys.js"></script>
-</head>
-<body id="t">
-  <div id="header">
-    <h1 i18n-content="title"></h1>
-    <p i18n-content="description"></p>
-  </div>
-  <div id="content">
-    <h2 id="tableTitle" i18n-content="tableTitle"></h2>
-    <div id="anchor" jscontent="anchor"></div>
-    <button id="expandAll" class="global-button" i18n-content="expandAllBtn">
-    </button>
-    <button id="collapseAll" class="global-button"
-        i18n-content="collapseAllBtn"></button>
-    <p id="status"></p>
-    <table class="list" id="details">
-      <tr jsselect="details">
-        <td class="name"><div jscontent="statName"></div></td>
-        <td class="button-cell"><button jsvalues="id:statName + '-value-btn'"
-            class="expand-status"></button></td>
-        <td class="number"><div class="stat-value" jscontent="statValue"
-            jsvalues="id:statName + '-value'"></div></td>
-      </tr>
-    </table>
-  </div>
-</body>
-</html>
diff --git a/chrome/browser/resources/feedback/html/default.html b/chrome/browser/resources/feedback/html/default.html
index 6f3c459..8875107 100644
--- a/chrome/browser/resources/feedback/html/default.html
+++ b/chrome/browser/resources/feedback/html/default.html
@@ -52,13 +52,13 @@
       <label id="screenshot-label" i18n-content="screenshot"></label>
       <img id="screenshot-image" alt="screenshot">
     </div>
-<if expr="pp_ifdef('chromeos')">
     <!-- System Information -->
     <div class="checkbox-field-container">
       <input id="sys-info-checkbox" type="checkbox" aria-labelledby="sys-info-label" checked>
       <label id="sys-info-label" i18n-values=".innerHTML:sys-info"></label>
       </span>
     </div>
+<if expr="pp_ifdef('chromeos')">
     <!-- Performance Feedback -->
     <div id="performance-info-area" hidden>
       <input id="performance-info-checkbox" type="checkbox">
diff --git a/chrome/browser/resources/feedback/js/feedback.js b/chrome/browser/resources/feedback/js/feedback.js
index 1edda2d..f980078 100644
--- a/chrome/browser/resources/feedback/js/feedback.js
+++ b/chrome/browser/resources/feedback/js/feedback.js
@@ -136,29 +136,19 @@ function sendReport() {
 
   var useSystemInfo = false;
   var useHistograms = false;
-  // On ChromeOS, since we gather System info, check if the user has given his
-  // permission for us to send system info.
-<if expr="pp_ifdef('chromeos')">
   if ($('sys-info-checkbox') != null &&
       $('sys-info-checkbox').checked &&
       systemInfo != null) {
     // Send histograms along with system info.
     useSystemInfo = useHistograms = true;
   }
+<if expr="pp_ifdef('chromeos')">
   if ($('performance-info-checkbox') == null ||
       !($('performance-info-checkbox').checked)) {
     feedbackInfo.traceId = null;
   }
 </if>
 
-// On NonChromeOS, we don't have any system information gathered except the
-// Chrome version and the OS version. Hence for Chrome, pass the system info
-// through.
-<if expr="not pp_ifdef('chromeos')">
-  if (systemInfo != null)
-    useSystemInfo = true;
-</if>
-
   if (useSystemInfo) {
     if (feedbackInfo.systemInformation != null) {
       // Concatenate sysinfo if we had any initial system information
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 3824df0..1d9f7ba 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -49,6 +49,7 @@
 #include "chrome/browser/ui/webui/signin/user_manager_ui.h"
 #include "chrome/browser/ui/webui/signin_internals_ui.h"
 #include "chrome/browser/ui/webui/sync_internals_ui.h"
+#include "chrome/browser/ui/webui/system_info_ui.h"
 #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
 #include "chrome/browser/ui/webui/version_ui.h"
@@ -114,7 +115,6 @@
 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
 #include "chrome/browser/ui/webui/chromeos/slow_trace_ui.h"
 #include "chrome/browser/ui/webui/chromeos/slow_ui.h"
-#include "chrome/browser/ui/webui/chromeos/system_info_ui.h"
 #endif
 
 #if defined(USE_AURA)
@@ -360,6 +360,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<SuggestionsInternalsUI>;
   if (url.host() == chrome::kChromeUISyncFileSystemInternalsHost)
     return &NewWebUI<SyncFileSystemInternalsUI>;
+  if (url.host() == chrome::kChromeUISystemInfoHost)
+    return &NewWebUI<SystemInfoUI>;
   // Uber frame is not used on Android.
   if (url.host() == chrome::kChromeUIUberFrameHost)
     return &NewWebUI<UberFrameUI>;
@@ -408,8 +410,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<chromeos::SlowUI>;
   if (url.host() == chrome::kChromeUISlowTraceHost)
     return &NewWebUI<chromeos::SlowTraceController>;
-  if (url.host() == chrome::kChromeUISystemInfoHost)
-    return &NewWebUI<chromeos::SystemInfoUI>;
   if (url.host() == chrome::kChromeUINetworkHost)
     return &NewWebUI<chromeos::NetworkUI>;
 #endif  // defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/system_info_ui.cc
index b5656e1..900f1ab 100644
--- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc
+++ b/chrome/browser/ui/webui/system_info_ui.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "chrome/browser/ui/webui/system_info_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -18,7 +18,7 @@
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/system_logs/about_system_logs_fetcher.h"
+#include "chrome/browser/feedback/system_logs/about_system_logs_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
@@ -39,8 +39,8 @@
 
 using content::WebContents;
 using content::WebUIMessageHandler;
-
-namespace chromeos {
+using system_logs::SystemLogsResponse;
+using system_logs::AboutSystemLogsFetcher;
 
 class SystemInfoUIHTMLSource : public content::URLDataSource{
  public:
@@ -193,5 +193,3 @@ SystemInfoUI::SystemInfoUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   content::URLDataSource::Add(profile, html_source);
 }
-
-}  // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.h b/chrome/browser/ui/webui/system_info_ui.h
index 255ce21..6380329 100644
--- a/chrome/browser/ui/webui/chromeos/system_info_ui.h
+++ b/chrome/browser/ui/webui/system_info_ui.h
@@ -1,14 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYSTEM_INFO_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYSTEM_INFO_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SYSTEM_INFO_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_SYSTEM_INFO_UI_H_
 
 #include "content/public/browser/web_ui_controller.h"
 
-namespace chromeos {
-
 class SystemInfoUI : public content::WebUIController {
  public:
   explicit SystemInfoUI(content::WebUI* web_ui);
@@ -17,6 +15,4 @@ class SystemInfoUI : public content::WebUIController {
   DISALLOW_COPY_AND_ASSIGN(SystemInfoUI);
 };
 
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYSTEM_INFO_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SYSTEM_INFO_UI_H_