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

Side by Side Diff: mojo/services/tracing/public/cpp/trace_provider_impl.cc

Issue 1539863002: Convert Pass()→std::move() in mojo/services/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix missing forward declare that was masked by pre-existing incorrect #include ordering. Created 5 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "mojo/services/tracing/public/cpp/trace_provider_impl.h" 5 #include "mojo/services/tracing/public/cpp/trace_provider_impl.h"
6 6
7 #include <utility>
8
7 #include "base/callback.h" 9 #include "base/callback.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
10 #include "base/time/time.h" 12 #include "base/time/time.h"
11 #include "base/trace_event/trace_config.h" 13 #include "base/trace_event/trace_config.h"
12 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
13 #include "mojo/application/public/cpp/application_connection.h" 15 #include "mojo/application/public/cpp/application_connection.h"
14 #include "mojo/application/public/cpp/application_impl.h" 16 #include "mojo/application/public/cpp/application_impl.h"
15 17
16 namespace mojo { 18 namespace mojo {
17 19
18 TraceProviderImpl::TraceProviderImpl() 20 TraceProviderImpl::TraceProviderImpl()
19 : binding_(this), tracing_forced_(false), weak_factory_(this) {} 21 : binding_(this), tracing_forced_(false), weak_factory_(this) {}
20 22
21 TraceProviderImpl::~TraceProviderImpl() {} 23 TraceProviderImpl::~TraceProviderImpl() {}
22 24
23 void TraceProviderImpl::Bind(InterfaceRequest<tracing::TraceProvider> request) { 25 void TraceProviderImpl::Bind(InterfaceRequest<tracing::TraceProvider> request) {
24 if (!binding_.is_bound()) { 26 if (!binding_.is_bound()) {
25 binding_.Bind(request.Pass()); 27 binding_.Bind(std::move(request));
26 } else { 28 } else {
27 LOG(ERROR) << "Cannot accept two connections to TraceProvider."; 29 LOG(ERROR) << "Cannot accept two connections to TraceProvider.";
28 } 30 }
29 } 31 }
30 32
31 void TraceProviderImpl::StartTracing(const String& categories, 33 void TraceProviderImpl::StartTracing(const String& categories,
32 tracing::TraceRecorderPtr recorder) { 34 tracing::TraceRecorderPtr recorder) {
33 DCHECK(!recorder_); 35 DCHECK(!recorder_);
34 recorder_ = recorder.Pass(); 36 recorder_ = std::move(recorder);
35 tracing_forced_ = false; 37 tracing_forced_ = false;
36 if (!base::trace_event::TraceLog::GetInstance()->IsEnabled()) { 38 if (!base::trace_event::TraceLog::GetInstance()->IsEnabled()) {
37 std::string categories_str = categories.To<std::string>(); 39 std::string categories_str = categories.To<std::string>();
38 base::trace_event::TraceLog::GetInstance()->SetEnabled( 40 base::trace_event::TraceLog::GetInstance()->SetEnabled(
39 base::trace_event::TraceConfig(categories_str, 41 base::trace_event::TraceConfig(categories_str,
40 base::trace_event::RECORD_UNTIL_FULL), 42 base::trace_event::RECORD_UNTIL_FULL),
41 base::trace_event::TraceLog::RECORDING_MODE); 43 base::trace_event::TraceLog::RECORDING_MODE);
42 } 44 }
43 } 45 }
44 46
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // events. Empty string is not a valid chunk to record so skip in this case. 91 // events. Empty string is not a valid chunk to record so skip in this case.
90 if (!events_str->data().empty()) { 92 if (!events_str->data().empty()) {
91 recorder_->Record(mojo::String(events_str->data())); 93 recorder_->Record(mojo::String(events_str->data()));
92 } 94 }
93 if (!has_more_events) { 95 if (!has_more_events) {
94 recorder_.reset(); 96 recorder_.reset();
95 } 97 }
96 } 98 }
97 99
98 } // namespace mojo 100 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/test_service/tracked_service.cc ('k') | mojo/services/tracing/public/cpp/tracing_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698