Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(870)

Unified Diff: chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc

Issue 1825913002: [Extensions] Convert APIs to use movable types [7] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Steven's Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
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 b9af69b06d6c5d412b041daf93085fa6b7873db4..d0de98acef6c9f4246c19c62af02e5e603aa2cb8 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
@@ -13,7 +13,6 @@
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
@@ -78,10 +77,9 @@ scoped_ptr<LogParser> CreateLogParser(const std::string& log_type) {
return scoped_ptr<LogParser>();
}
-void CollectLogInfo(
- FilterHandler* filter_handler,
- system_logs::SystemLogsResponse* logs,
- std::vector<linked_ptr<api::log_private::LogEntry> >* output) {
+void CollectLogInfo(FilterHandler* filter_handler,
+ system_logs::SystemLogsResponse* logs,
+ std::vector<api::log_private::LogEntry>* output) {
for (system_logs::SystemLogsResponse::const_iterator
request_it = logs->begin(); request_it != logs->end(); ++request_it) {
if (!filter_handler->IsValidSource(request_it->first)) {
@@ -424,13 +422,10 @@ bool LogPrivateGetHistoricalFunction::RunAsync() {
void LogPrivateGetHistoricalFunction::OnSystemLogsLoaded(
scoped_ptr<system_logs::SystemLogsResponse> sys_info) {
- std::vector<linked_ptr<api::log_private::LogEntry> > data;
-
- CollectLogInfo(filter_handler_.get(), sys_info.get(), &data);
// Prepare result
api::log_private::Result result;
- result.data = data;
+ CollectLogInfo(filter_handler_.get(), sys_info.get(), &result.data);
api::log_private::Filter::Populate(
*((filter_handler_->GetFilter())->ToValue()), &result.filter);
SetResult(result.ToValue().release());
« no previous file with comments | « chrome/browser/extensions/api/log_private/log_parser.cc ('k') | chrome/browser/extensions/api/log_private/syslog_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698