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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc

Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc ('k') | webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
diff --git a/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
index 539d43e80de4f5fbf8b916f1d01c642aef70dc54..ad4beb2d8c19fbaf73fe3b3311d6b19b2026d2ab 100644
--- a/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
+++ b/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
@@ -207,21 +207,24 @@ class LocalFileSyncContextTest : public testing::Test {
};
TEST_F(LocalFileSyncContextTest, ConstructAndDestruct) {
- sync_context_ = new LocalFileSyncContext(
- ui_task_runner_, io_task_runner_);
+ sync_context_ =
+ new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get());
sync_context_->ShutdownOnUIThread();
}
TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) {
- CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName,
- io_task_runner_, file_task_runner_);
+ CannedSyncableFileSystem file_system(GURL(kOrigin1),
+ kServiceName,
+ io_task_runner_.get(),
+ file_task_runner_.get());
file_system.SetUp();
- sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
+ sync_context_ =
+ new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get());
// Initializes file_system using |sync_context_|.
EXPECT_EQ(SYNC_STATUS_OK,
- file_system.MaybeInitializeFileSystemContext(sync_context_));
+ file_system.MaybeInitializeFileSystemContext(sync_context_.get()));
// Make sure everything's set up for file_system to be able to handle
// syncable file system operations.
@@ -232,7 +235,7 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) {
// Calling MaybeInitialize for the same context multiple times must be ok.
EXPECT_EQ(SYNC_STATUS_OK,
- file_system.MaybeInitializeFileSystemContext(sync_context_));
+ file_system.MaybeInitializeFileSystemContext(sync_context_.get()));
EXPECT_EQ(sync_context_.get(),
file_system.file_system_context()->sync_context());
@@ -254,20 +257,25 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) {
}
TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
- CannedSyncableFileSystem file_system1(GURL(kOrigin1), kServiceName,
- io_task_runner_, file_task_runner_);
- CannedSyncableFileSystem file_system2(GURL(kOrigin2), kServiceName,
- io_task_runner_, file_task_runner_);
+ CannedSyncableFileSystem file_system1(GURL(kOrigin1),
+ kServiceName,
+ io_task_runner_.get(),
+ file_task_runner_.get());
+ CannedSyncableFileSystem file_system2(GURL(kOrigin2),
+ kServiceName,
+ io_task_runner_.get(),
+ file_task_runner_.get());
file_system1.SetUp();
file_system2.SetUp();
- sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
+ sync_context_ =
+ new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get());
// Initializes file_system1 and file_system2.
EXPECT_EQ(SYNC_STATUS_OK,
- file_system1.MaybeInitializeFileSystemContext(sync_context_));
+ file_system1.MaybeInitializeFileSystemContext(sync_context_.get()));
EXPECT_EQ(SYNC_STATUS_OK,
- file_system2.MaybeInitializeFileSystemContext(sync_context_));
+ file_system2.MaybeInitializeFileSystemContext(sync_context_.get()));
EXPECT_EQ(base::PLATFORM_FILE_OK, file_system1.OpenFileSystem());
EXPECT_EQ(base::PLATFORM_FILE_OK, file_system2.OpenFileSystem());
@@ -340,12 +348,15 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
#define MAYBE_PrepareSyncWhileWriting PrepareSyncWhileWriting
#endif
TEST_F(LocalFileSyncContextTest, MAYBE_PrepareSyncWhileWriting) {
- CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName,
- io_task_runner_, file_task_runner_);
+ CannedSyncableFileSystem file_system(GURL(kOrigin1),
+ kServiceName,
+ io_task_runner_.get(),
+ file_task_runner_.get());
file_system.SetUp();
- sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
+ sync_context_ =
+ new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get());
EXPECT_EQ(SYNC_STATUS_OK,
- file_system.MaybeInitializeFileSystemContext(sync_context_));
+ file_system.MaybeInitializeFileSystemContext(sync_context_.get()));
EXPECT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem());
@@ -397,13 +408,16 @@ TEST_F(LocalFileSyncContextTest, MAYBE_PrepareSyncWhileWriting) {
}
TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion) {
- CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName,
- io_task_runner_, file_task_runner_);
+ CannedSyncableFileSystem file_system(GURL(kOrigin1),
+ kServiceName,
+ io_task_runner_.get(),
+ file_task_runner_.get());
file_system.SetUp();
- sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
+ sync_context_ =
+ new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get());
ASSERT_EQ(SYNC_STATUS_OK,
- file_system.MaybeInitializeFileSystemContext(sync_context_));
+ file_system.MaybeInitializeFileSystemContext(sync_context_.get()));
ASSERT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem());
// Record the initial usage (likely 0).
@@ -484,13 +498,16 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) {
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
- CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName,
- io_task_runner_, file_task_runner_);
+ CannedSyncableFileSystem file_system(GURL(kOrigin1),
+ kServiceName,
+ io_task_runner_.get(),
+ file_task_runner_.get());
file_system.SetUp();
- sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
+ sync_context_ =
+ new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get());
ASSERT_EQ(SYNC_STATUS_OK,
- file_system.MaybeInitializeFileSystemContext(sync_context_));
+ file_system.MaybeInitializeFileSystemContext(sync_context_.get()));
ASSERT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem());
const FileSystemURL kFile1(file_system.URL("file1"));
@@ -631,13 +648,16 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate_NoParent) {
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
- CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName,
- io_task_runner_, file_task_runner_);
+ CannedSyncableFileSystem file_system(GURL(kOrigin1),
+ kServiceName,
+ io_task_runner_.get(),
+ file_task_runner_.get());
file_system.SetUp();
- sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
+ sync_context_ =
+ new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get());
ASSERT_EQ(SYNC_STATUS_OK,
- file_system.MaybeInitializeFileSystemContext(sync_context_));
+ file_system.MaybeInitializeFileSystemContext(sync_context_.get()));
ASSERT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem());
const char kTestFileData[] = "Lorem ipsum!";
« no previous file with comments | « webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc ('k') | webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698