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

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

Issue 363373003: Replace MessageLoopProxy::current() with ThreadTaskRunnerHandle::Get() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | Annotate | Revision Log
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/drive_backend/sync_engine_initializer. h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer. h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/thread_task_runner_handle.h"
10 #include "chrome/browser/drive/drive_api_util.h" 11 #include "chrome/browser/drive/drive_api_util.h"
11 #include "chrome/browser/drive/drive_uploader.h" 12 #include "chrome/browser/drive/drive_uploader.h"
12 #include "chrome/browser/drive/fake_drive_service.h" 13 #include "chrome/browser/drive/fake_drive_service.h"
13 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h" 14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h"
14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util. h" 15 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util. h"
15 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" 16 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
16 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" 17 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
17 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" 18 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
18 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" 19 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
19 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" 20 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
(...skipping 28 matching lines...) Expand all
48 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); 49 ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
49 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); 50 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
50 51
51 scoped_ptr<drive::DriveServiceInterface> 52 scoped_ptr<drive::DriveServiceInterface>
52 fake_drive_service(new drive::FakeDriveService); 53 fake_drive_service(new drive::FakeDriveService);
53 54
54 sync_context_.reset(new SyncEngineContext( 55 sync_context_.reset(new SyncEngineContext(
55 fake_drive_service.Pass(), 56 fake_drive_service.Pass(),
56 scoped_ptr<drive::DriveUploaderInterface>(), 57 scoped_ptr<drive::DriveUploaderInterface>(),
57 NULL, 58 NULL,
58 base::MessageLoopProxy::current(), 59 base::ThreadTaskRunnerHandle::Get(),
59 base::MessageLoopProxy::current(), 60 base::ThreadTaskRunnerHandle::Get(),
60 base::MessageLoopProxy::current())); 61 base::ThreadTaskRunnerHandle::Get()));
61 62
62 sync_task_manager_.reset(new SyncTaskManager( 63 sync_task_manager_.reset(new SyncTaskManager(
63 base::WeakPtr<SyncTaskManager::Client>(), 64 base::WeakPtr<SyncTaskManager::Client>(),
64 1 /* maximum_parallel_task */, 65 1 /* maximum_parallel_task */,
65 base::MessageLoopProxy::current())); 66 base::ThreadTaskRunnerHandle::Get()));
66 sync_task_manager_->Initialize(SYNC_STATUS_OK); 67 sync_task_manager_->Initialize(SYNC_STATUS_OK);
67 } 68 }
68 69
69 virtual void TearDown() OVERRIDE { 70 virtual void TearDown() OVERRIDE {
70 sync_task_manager_.reset(); 71 sync_task_manager_.reset();
71 metadata_database_.reset(); 72 metadata_database_.reset();
72 sync_context_.reset(); 73 sync_context_.reset();
73 base::RunLoop().RunUntilIdle(); 74 base::RunLoop().RunUntilIdle();
74 } 75 }
75 76
(...skipping 26 matching lines...) Expand all
102 metadata_database_ = initializer->PassMetadataDatabase(); 103 metadata_database_ = initializer->PassMetadataDatabase();
103 } 104 }
104 105
105 SyncStatusCode PopulateDatabase( 106 SyncStatusCode PopulateDatabase(
106 const google_apis::FileResource& sync_root, 107 const google_apis::FileResource& sync_root,
107 const google_apis::FileResource** app_roots, 108 const google_apis::FileResource** app_roots,
108 size_t app_roots_count) { 109 size_t app_roots_count) {
109 SyncStatusCode status = SYNC_STATUS_UNKNOWN; 110 SyncStatusCode status = SYNC_STATUS_UNKNOWN;
110 scoped_ptr<MetadataDatabase> database; 111 scoped_ptr<MetadataDatabase> database;
111 MetadataDatabase::Create( 112 MetadataDatabase::Create(
112 base::MessageLoopProxy::current(), 113 base::ThreadTaskRunnerHandle::Get(),
113 base::MessageLoopProxy::current(), 114 base::ThreadTaskRunnerHandle::Get(),
114 database_path(), 115 database_path(),
115 in_memory_env_.get(), 116 in_memory_env_.get(),
116 CreateResultReceiver(&status, &database)); 117 CreateResultReceiver(&status, &database));
117 base::RunLoop().RunUntilIdle(); 118 base::RunLoop().RunUntilIdle();
118 if (status != SYNC_STATUS_OK) 119 if (status != SYNC_STATUS_OK)
119 return status; 120 return status;
120 121
121 // |app_root_list| must not own the resources here. Be sure to call 122 // |app_root_list| must not own the resources here. Be sure to call
122 // weak_clear later. 123 // weak_clear later.
123 ScopedVector<google_apis::FileResource> app_root_list; 124 ScopedVector<google_apis::FileResource> app_root_list;
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 352
352 EXPECT_EQ(0u, CountTrackersForFile(sync_root->file_id())); 353 EXPECT_EQ(0u, CountTrackersForFile(sync_root->file_id()));
353 EXPECT_FALSE(HasNoParent(sync_root->file_id())); 354 EXPECT_FALSE(HasNoParent(sync_root->file_id()));
354 355
355 EXPECT_EQ(1u, CountFileMetadata()); 356 EXPECT_EQ(1u, CountFileMetadata());
356 EXPECT_EQ(1u, CountFileTracker()); 357 EXPECT_EQ(1u, CountFileTracker());
357 } 358 }
358 359
359 } // namespace drive_backend 360 } // namespace drive_backend
360 } // namespace sync_file_system 361 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698