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

Side by Side Diff: chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc

Issue 1873683002: Convert //chrome/browser/sync_file_system 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 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h" 10 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 FileSystemContext* file_system_context() { 96 FileSystemContext* file_system_context() {
97 return file_system_.file_system_context(); 97 return file_system_.file_system_context();
98 } 98 }
99 99
100 LocalFileChangeTracker* change_tracker() { 100 LocalFileChangeTracker* change_tracker() {
101 return file_system_.backend()->change_tracker(); 101 return file_system_.backend()->change_tracker();
102 } 102 }
103 103
104 base::ScopedTempDir data_dir_; 104 base::ScopedTempDir data_dir_;
105 content::TestBrowserThreadBundle thread_bundle_; 105 content::TestBrowserThreadBundle thread_bundle_;
106 scoped_ptr<leveldb::Env> in_memory_env_; 106 std::unique_ptr<leveldb::Env> in_memory_env_;
107 CannedSyncableFileSystem file_system_; 107 CannedSyncableFileSystem file_system_;
108 108
109 private: 109 private:
110 scoped_refptr<LocalFileSyncContext> sync_context_; 110 scoped_refptr<LocalFileSyncContext> sync_context_;
111 111
112 base::WeakPtrFactory<SyncableFileSystemTest> weak_factory_; 112 base::WeakPtrFactory<SyncableFileSystemTest> weak_factory_;
113 113
114 DISALLOW_COPY_AND_ASSIGN(SyncableFileSystemTest); 114 DISALLOW_COPY_AND_ASSIGN(SyncableFileSystemTest);
115 }; 115 };
116 116
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 sync_file_system::SYNC_FILE_TYPE_DIRECTORY)); 245 sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
246 VerifyAndClearChange(URL(kPath1), 246 VerifyAndClearChange(URL(kPath1),
247 FileChange(FileChange::FILE_CHANGE_DELETE, 247 FileChange(FileChange::FILE_CHANGE_DELETE,
248 sync_file_system::SYNC_FILE_TYPE_DIRECTORY)); 248 sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
249 VerifyAndClearChange(URL(kPath2), 249 VerifyAndClearChange(URL(kPath2),
250 FileChange(FileChange::FILE_CHANGE_DELETE, 250 FileChange(FileChange::FILE_CHANGE_DELETE,
251 sync_file_system::SYNC_FILE_TYPE_FILE)); 251 sync_file_system::SYNC_FILE_TYPE_FILE));
252 } 252 }
253 253
254 } // namespace sync_file_system 254 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698