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

Side by Side Diff: chrome/browser/sync_file_system/local/local_file_sync_context_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 "chrome/browser/sync_file_system/local/local_file_sync_context.h" 5 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 EXPECT_TRUE(changes.list().back().IsFile()); 341 EXPECT_TRUE(changes.list().back().IsFile());
342 EXPECT_TRUE(changes.list().back().IsAddOrUpdate()); 342 EXPECT_TRUE(changes.list().back().IsAddOrUpdate());
343 343
344 sync_context_->ShutdownOnUIThread(); 344 sync_context_->ShutdownOnUIThread();
345 sync_context_ = nullptr; 345 sync_context_ = nullptr;
346 346
347 file_system.TearDown(); 347 file_system.TearDown();
348 } 348 }
349 349
350 base::ScopedTempDir dir_; 350 base::ScopedTempDir dir_;
351 scoped_ptr<leveldb::Env> in_memory_env_; 351 std::unique_ptr<leveldb::Env> in_memory_env_;
352 352
353 // These need to remain until the very end. 353 // These need to remain until the very end.
354 content::TestBrowserThreadBundle thread_bundle_; 354 content::TestBrowserThreadBundle thread_bundle_;
355 355
356 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; 356 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
357 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; 357 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
358 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_; 358 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
359 359
360 scoped_refptr<LocalFileSyncContext> sync_context_; 360 scoped_refptr<LocalFileSyncContext> sync_context_;
361 361
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 953
954 // Make sure kDir and kFile are created by ApplyRemoteChange. 954 // Make sure kDir and kFile are created by ApplyRemoteChange.
955 EXPECT_EQ(base::File::FILE_OK, file_system.FileExists(kFile)); 955 EXPECT_EQ(base::File::FILE_OK, file_system.FileExists(kFile));
956 EXPECT_EQ(base::File::FILE_OK, file_system.DirectoryExists(kDir)); 956 EXPECT_EQ(base::File::FILE_OK, file_system.DirectoryExists(kDir));
957 957
958 sync_context_->ShutdownOnUIThread(); 958 sync_context_->ShutdownOnUIThread();
959 file_system.TearDown(); 959 file_system.TearDown();
960 } 960 }
961 961
962 } // namespace sync_file_system 962 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698