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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc

Issue 610223002: [SyncFS] Use nullptr instead of NULL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/sync_file_system/drive_backend/sync_engine_context.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/sequenced_task_runner.h" 10 #include "base/sequenced_task_runner.h"
(...skipping 10 matching lines...) Expand all
21 SyncEngineContext::SyncEngineContext( 21 SyncEngineContext::SyncEngineContext(
22 scoped_ptr<drive::DriveServiceInterface> drive_service, 22 scoped_ptr<drive::DriveServiceInterface> drive_service,
23 scoped_ptr<drive::DriveUploaderInterface> drive_uploader, 23 scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
24 TaskLogger* task_logger, 24 TaskLogger* task_logger,
25 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner, 25 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
26 const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner) 26 const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner)
27 : drive_service_(drive_service.Pass()), 27 : drive_service_(drive_service.Pass()),
28 drive_uploader_(drive_uploader.Pass()), 28 drive_uploader_(drive_uploader.Pass()),
29 task_logger_(task_logger ? task_logger->AsWeakPtr() 29 task_logger_(task_logger ? task_logger->AsWeakPtr()
30 : base::WeakPtr<TaskLogger>()), 30 : base::WeakPtr<TaskLogger>()),
31 remote_change_processor_(NULL), 31 remote_change_processor_(nullptr),
32 ui_task_runner_(ui_task_runner), 32 ui_task_runner_(ui_task_runner),
33 worker_task_runner_(worker_task_runner) { 33 worker_task_runner_(worker_task_runner) {
34 sequence_checker_.DetachFromSequence(); 34 sequence_checker_.DetachFromSequence();
35 } 35 }
36 36
37 SyncEngineContext::~SyncEngineContext() { 37 SyncEngineContext::~SyncEngineContext() {
38 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 38 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
39 } 39 }
40 40
41 drive::DriveServiceInterface* SyncEngineContext::GetDriveService() { 41 drive::DriveServiceInterface* SyncEngineContext::GetDriveService() {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 DCHECK(remote_change_processor); 91 DCHECK(remote_change_processor);
92 remote_change_processor_ = remote_change_processor; 92 remote_change_processor_ = remote_change_processor;
93 } 93 }
94 94
95 void SyncEngineContext::DetachFromSequence() { 95 void SyncEngineContext::DetachFromSequence() {
96 sequence_checker_.DetachFromSequence(); 96 sequence_checker_.DetachFromSequence();
97 } 97 }
98 98
99 } // namespace drive_backend 99 } // namespace drive_backend
100 } // namespace sync_file_system 100 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698