Generalize network_event_log -> device_event_log

chrome/browser/chromeos/system/syslogs_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/syslogs_provider.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 313 matching lines @@
     LoadCompressedLogs(zip_file, zip_content);
     base::DeleteFile(zip_file, false);
   }
 
   // Include dbus statistics summary
   (*logs)["dbus"] = dbus::statistics::GetAsString(
       dbus::statistics::SHOW_INTERFACE,
       dbus::statistics::FORMAT_ALL);
 
   // Include recent network log events
-  (*logs)["network_event_log"] = network_event_log::GetAsString(
-      network_event_log::OLDEST_FIRST,
-      "time,file,desc",
-      network_event_log::kDefaultLogLevel,
+  (*logs)["network_event_log"] = device_event_log::GetAsString(
+      device_event_log::OLDEST_FIRST,
+      "time,file",
+      device_event_log::LOG_TYPE_NETWORK,
+      device_event_log::kDefaultLogLevel,
+      system::kFeedbackMaxLineCount);
+
+  // Include recent non-network device events
+  (*logs)["device_event_log"] = device_event_log::GetAsString(
+      device_event_log::OLDEST_FIRST,
+      "time,file",
+      device_event_log::LOG_TYPE_NON_NETWORK,
+      device_event_log::kDefaultLogLevel,
       system::kFeedbackMaxLineCount);
 
   // SyslogsMemoryHandler will clean itself up.
   // SyslogsMemoryHandler::OnDetailsAvailable() will modify |logs| and call
   // request->ForwardResult(logs, zip_content).
   scoped_refptr<SyslogsMemoryHandler>
       handler(new SyslogsMemoryHandler(callback, logs, zip_content));
   // TODO(jamescook): Maybe we don't need to update histograms here?
   handler->StartFetch(MemoryDetails::UPDATE_USER_METRICS);
 }
@@ skipping 51 matching lines @@
   return Singleton<SyslogsProviderImpl,
                    DefaultSingletonTraits<SyslogsProviderImpl> >::get();
 }
 
 SyslogsProvider* SyslogsProvider::GetInstance() {
   return SyslogsProviderImpl::GetInstance();
 }
 
 }  // namespace system
 }  // namespace chromeos