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

Side by Side Diff: chrome/browser/chromeos/drive/change_list_processor_unittest.cc

Issue 1124813003: [chrome/browser/chromeos/drive] Avoid use of MessageLoopProxy by use of TTRH (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Review Comments 3 : Indent Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/drive/change_list_processor.h" 5 #include "chrome/browser/chromeos/drive/change_list_processor.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/message_loop/message_loop_proxy.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/thread_task_runner_handle.h"
9 #include "base/values.h" 10 #include "base/values.h"
10 #include "chrome/browser/chromeos/drive/drive.pb.h" 11 #include "chrome/browser/chromeos/drive/drive.pb.h"
11 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" 12 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
12 #include "chrome/browser/chromeos/drive/file_cache.h" 13 #include "chrome/browser/chromeos/drive/file_cache.h"
13 #include "chrome/browser/chromeos/drive/file_change.h" 14 #include "chrome/browser/chromeos/drive/file_change.h"
14 #include "chrome/browser/chromeos/drive/file_system_util.h" 15 #include "chrome/browser/chromeos/drive/file_system_util.h"
15 #include "chrome/browser/chromeos/drive/resource_metadata.h" 16 #include "chrome/browser/chromeos/drive/resource_metadata.h"
16 #include "chrome/browser/chromeos/drive/test_util.h" 17 #include "chrome/browser/chromeos/drive/test_util.h"
17 #include "content/public/test/test_browser_thread_bundle.h" 18 #include "content/public/test/test_browser_thread_bundle.h"
18 #include "google_apis/drive/drive_api_parser.h" 19 #include "google_apis/drive/drive_api_parser.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp); 96 change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp);
96 return change_lists.Pass(); 97 return change_lists.Pass();
97 } 98 }
98 99
99 class ChangeListProcessorTest : public testing::Test { 100 class ChangeListProcessorTest : public testing::Test {
100 protected: 101 protected:
101 void SetUp() override { 102 void SetUp() override {
102 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 103 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
103 104
104 metadata_storage_.reset(new ResourceMetadataStorage( 105 metadata_storage_.reset(new ResourceMetadataStorage(
105 temp_dir_.path(), base::MessageLoopProxy::current().get())); 106 temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
106 ASSERT_TRUE(metadata_storage_->Initialize()); 107 ASSERT_TRUE(metadata_storage_->Initialize());
107 108
108 fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter); 109 fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
109 cache_.reset(new FileCache(metadata_storage_.get(), 110 cache_.reset(new FileCache(metadata_storage_.get(),
110 temp_dir_.path(), 111 temp_dir_.path(),
111 base::MessageLoopProxy::current().get(), 112 base::ThreadTaskRunnerHandle::Get().get(),
112 fake_free_disk_space_getter_.get())); 113 fake_free_disk_space_getter_.get()));
113 ASSERT_TRUE(cache_->Initialize()); 114 ASSERT_TRUE(cache_->Initialize());
114 115
115 metadata_.reset(new internal::ResourceMetadata( 116 metadata_.reset(new internal::ResourceMetadata(
116 metadata_storage_.get(), cache_.get(), 117 metadata_storage_.get(), cache_.get(),
117 base::MessageLoopProxy::current())); 118 base::ThreadTaskRunnerHandle::Get()));
118 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize()); 119 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
119 } 120 }
120 121
121 // Applies the |changes| to |metadata_| as a full resource list of changestamp 122 // Applies the |changes| to |metadata_| as a full resource list of changestamp
122 // |kBaseResourceListChangestamp|. 123 // |kBaseResourceListChangestamp|.
123 FileError ApplyFullResourceList(ScopedVector<ChangeList> changes) { 124 FileError ApplyFullResourceList(ScopedVector<ChangeList> changes) {
124 scoped_ptr<google_apis::AboutResource> about_resource( 125 scoped_ptr<google_apis::AboutResource> about_resource(
125 new google_apis::AboutResource); 126 new google_apis::AboutResource);
126 about_resource->set_largest_change_id(kBaseResourceListChangestamp); 127 about_resource->set_largest_change_id(kBaseResourceListChangestamp);
127 about_resource->set_root_folder_id(kRootId); 128 about_resource->set_root_folder_id(kRootId);
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 ApplyChangeList(change_lists.Pass(), &changed_files)); 649 ApplyChangeList(change_lists.Pass(), &changed_files));
649 650
650 // The change is rejected due to the old modification date. 651 // The change is rejected due to the old modification date.
651 ResourceEntry entry; 652 ResourceEntry entry;
652 EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(local_id, &entry)); 653 EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(local_id, &entry));
653 EXPECT_EQ(new_file_local.title(), entry.title()); 654 EXPECT_EQ(new_file_local.title(), entry.title());
654 } 655 }
655 656
656 } // namespace internal 657 } // namespace internal
657 } // namespace drive 658 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698