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

Side by Side Diff: sync/engine/directory_update_handler.h

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 #ifndef SYNC_ENGINE_DIRECTORY_UPDATE_HANDLER_H_ 5 #ifndef SYNC_ENGINE_DIRECTORY_UPDATE_HANDLER_H_
6 #define SYNC_ENGINE_DIRECTORY_UPDATE_HANDLER_H_ 6 #define SYNC_ENGINE_DIRECTORY_UPDATE_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "sync/base/sync_export.h" 13 #include "sync/base/sync_export.h"
14 #include "sync/engine/process_updates_util.h" 14 #include "sync/engine/process_updates_util.h"
15 #include "sync/engine/update_handler.h" 15 #include "sync/engine/update_handler.h"
16 #include "sync/internal_api/public/base/model_type.h" 16 #include "sync/internal_api/public/base/model_type.h"
17 #include "sync/internal_api/public/util/syncer_error.h" 17 #include "sync/internal_api/public/util/syncer_error.h"
18 18
19 namespace sync_pb { 19 namespace sync_pb {
20 class DataTypeProgressMarker; 20 class DataTypeProgressMarker;
21 class GarbageCollectionDirective; 21 class GarbageCollectionDirective;
22 class GetUpdatesResponse; 22 class GetUpdatesResponse;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 SyncerError ApplyUpdatesImpl(sessions::StatusController* status); 97 SyncerError ApplyUpdatesImpl(sessions::StatusController* status);
98 98
99 // Creates root node for the handled model type. 99 // Creates root node for the handled model type.
100 void CreateTypeRoot(syncable::ModelNeutralWriteTransaction* trans); 100 void CreateTypeRoot(syncable::ModelNeutralWriteTransaction* trans);
101 101
102 syncable::Directory* dir_; 102 syncable::Directory* dir_;
103 ModelType type_; 103 ModelType type_;
104 scoped_refptr<ModelSafeWorker> worker_; 104 scoped_refptr<ModelSafeWorker> worker_;
105 DirectoryTypeDebugInfoEmitter* debug_info_emitter_; 105 DirectoryTypeDebugInfoEmitter* debug_info_emitter_;
106 106
107 scoped_ptr<sync_pb::GarbageCollectionDirective> cached_gc_directive_; 107 std::unique_ptr<sync_pb::GarbageCollectionDirective> cached_gc_directive_;
108 108
109 DISALLOW_COPY_AND_ASSIGN(DirectoryUpdateHandler); 109 DISALLOW_COPY_AND_ASSIGN(DirectoryUpdateHandler);
110 }; 110 };
111 111
112 } // namespace syncer 112 } // namespace syncer
113 113
114 #endif // SYNC_ENGINE_DIRECTORY_UPDATE_HANDLER_H_ 114 #endif // SYNC_ENGINE_DIRECTORY_UPDATE_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698