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

Side by Side Diff: chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc

Issue 1556783002: Convert Pass()→std::move() for CrOS extension code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/log_private/log_private_api.h" 5 #include "chrome/browser/extensions/api/log_private/log_private_api.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/command_line.h" 11 #include "base/command_line.h"
11 #include "base/files/file_util.h" 12 #include "base/files/file_util.h"
12 #include "base/json/json_writer.h" 13 #include "base/json/json_writer.h"
13 #include "base/lazy_instance.h" 14 #include "base/lazy_instance.h"
14 #include "base/logging.h" 15 #include "base/logging.h"
15 #include "base/memory/linked_ptr.h" 16 #include "base/memory/linked_ptr.h"
16 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
17 #include "build/build_config.h" 18 #include "build/build_config.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 void LogPrivateAPI::AddEntriesOnUI(scoped_ptr<base::ListValue> value) { 246 void LogPrivateAPI::AddEntriesOnUI(scoped_ptr<base::ListValue> value) {
246 DCHECK_CURRENTLY_ON(BrowserThread::UI); 247 DCHECK_CURRENTLY_ON(BrowserThread::UI);
247 248
248 for (std::set<std::string>::iterator ix = net_internal_watches_.begin(); 249 for (std::set<std::string>::iterator ix = net_internal_watches_.begin();
249 ix != net_internal_watches_.end(); ++ix) { 250 ix != net_internal_watches_.end(); ++ix) {
250 // Create the event's arguments value. 251 // Create the event's arguments value.
251 scoped_ptr<base::ListValue> event_args(new base::ListValue()); 252 scoped_ptr<base::ListValue> event_args(new base::ListValue());
252 event_args->Append(value->DeepCopy()); 253 event_args->Append(value->DeepCopy());
253 scoped_ptr<Event> event( 254 scoped_ptr<Event> event(
254 new Event(::extensions::events::LOG_PRIVATE_ON_CAPTURED_EVENTS, 255 new Event(::extensions::events::LOG_PRIVATE_ON_CAPTURED_EVENTS,
255 ::events::kOnCapturedEvents, event_args.Pass())); 256 ::events::kOnCapturedEvents, std::move(event_args)));
256 EventRouter::Get(browser_context_) 257 EventRouter::Get(browser_context_)
257 ->DispatchEventToExtension(*ix, event.Pass()); 258 ->DispatchEventToExtension(*ix, std::move(event));
258 } 259 }
259 } 260 }
260 261
261 void LogPrivateAPI::CreateTempNetLogFile(const std::string& owner_extension_id, 262 void LogPrivateAPI::CreateTempNetLogFile(const std::string& owner_extension_id,
262 base::ScopedFILE* file) { 263 base::ScopedFILE* file) {
263 DCHECK(IsRunningOnSequenceThread()); 264 DCHECK(IsRunningOnSequenceThread());
264 265
265 // Create app-specific subdirectory in session logs folder. 266 // Create app-specific subdirectory in session logs folder.
266 base::FilePath app_log_dir = GetAppLogDirectory().Append(owner_extension_id); 267 base::FilePath app_log_dir = GetAppLogDirectory().Append(owner_extension_id);
267 if (!base::DirectoryExists(app_log_dir)) { 268 if (!base::DirectoryExists(app_log_dir)) {
(...skipping 18 matching lines...) Expand all
286 void LogPrivateAPI::StartObservingNetEvents( 287 void LogPrivateAPI::StartObservingNetEvents(
287 IOThread* io_thread, 288 IOThread* io_thread,
288 base::ScopedFILE* file) { 289 base::ScopedFILE* file) {
289 DCHECK_CURRENTLY_ON(BrowserThread::IO); 290 DCHECK_CURRENTLY_ON(BrowserThread::IO);
290 if (!file->get()) 291 if (!file->get())
291 return; 292 return;
292 293
293 write_to_file_observer_.reset(new net::WriteToFileNetLogObserver()); 294 write_to_file_observer_.reset(new net::WriteToFileNetLogObserver());
294 write_to_file_observer_->set_capture_mode( 295 write_to_file_observer_->set_capture_mode(
295 net::NetLogCaptureMode::IncludeCookiesAndCredentials()); 296 net::NetLogCaptureMode::IncludeCookiesAndCredentials());
296 write_to_file_observer_->StartObserving(io_thread->net_log(), file->Pass(), 297 write_to_file_observer_->StartObserving(io_thread->net_log(),
297 nullptr, nullptr); 298 std::move(*file), nullptr, nullptr);
298 } 299 }
299 300
300 void LogPrivateAPI::MaybeStartNetInternalLogging( 301 void LogPrivateAPI::MaybeStartNetInternalLogging(
301 const std::string& caller_extension_id, 302 const std::string& caller_extension_id,
302 IOThread* io_thread, 303 IOThread* io_thread,
303 api::log_private::EventSink event_sink) { 304 api::log_private::EventSink event_sink) {
304 DCHECK_CURRENTLY_ON(BrowserThread::IO); 305 DCHECK_CURRENTLY_ON(BrowserThread::IO);
305 if (!logging_net_internals_) { 306 if (!logging_net_internals_) {
306 logging_net_internals_ = true; 307 logging_net_internals_ = true;
307 event_sink_ = event_sink; 308 event_sink_ = event_sink;
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 entry->SetBoolean("isDirectory", false); 544 entry->SetBoolean("isDirectory", false);
544 base::ListValue* entry_list = new base::ListValue(); 545 base::ListValue* entry_list = new base::ListValue();
545 entry_list->Append(entry); 546 entry_list->Append(entry);
546 response->Set("entries", entry_list); 547 response->Set("entries", entry_list);
547 response->SetBoolean("multiple", false); 548 response->SetBoolean("multiple", false);
548 SetResult(response.release()); 549 SetResult(response.release());
549 SendResponse(succeeded); 550 SendResponse(succeeded);
550 } 551 }
551 552
552 } // namespace extensions 553 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698