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

Side by Side Diff: chrome/browser/chromeos/drive/resource_metadata_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/resource_metadata.h" 5 #include "chrome/browser/chromeos/drive/resource_metadata.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/single_thread_task_runner.h"
12 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/thread_task_runner_handle.h"
13 #include "chrome/browser/chromeos/drive/drive.pb.h" 15 #include "chrome/browser/chromeos/drive/drive.pb.h"
14 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" 16 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
15 #include "chrome/browser/chromeos/drive/file_cache.h" 17 #include "chrome/browser/chromeos/drive/file_cache.h"
16 #include "chrome/browser/chromeos/drive/file_system_util.h" 18 #include "chrome/browser/chromeos/drive/file_system_util.h"
17 #include "chrome/browser/chromeos/drive/test_util.h" 19 #include "chrome/browser/chromeos/drive/test_util.h"
18 #include "content/public/test/test_browser_thread_bundle.h" 20 #include "content/public/test/test_browser_thread_bundle.h"
19 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
20 22
21 namespace drive { 23 namespace drive {
22 namespace internal { 24 namespace internal {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 133
132 } // namespace 134 } // namespace
133 135
134 // Tests for methods running on the blocking task runner. 136 // Tests for methods running on the blocking task runner.
135 class ResourceMetadataTest : public testing::Test { 137 class ResourceMetadataTest : public testing::Test {
136 protected: 138 protected:
137 void SetUp() override { 139 void SetUp() override {
138 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 140 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
139 141
140 metadata_storage_.reset(new ResourceMetadataStorage( 142 metadata_storage_.reset(new ResourceMetadataStorage(
141 temp_dir_.path(), base::MessageLoopProxy::current().get())); 143 temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
142 ASSERT_TRUE(metadata_storage_->Initialize()); 144 ASSERT_TRUE(metadata_storage_->Initialize());
143 145
144 fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter); 146 fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
145 cache_.reset(new FileCache(metadata_storage_.get(), 147 cache_.reset(new FileCache(metadata_storage_.get(),
146 temp_dir_.path(), 148 temp_dir_.path(),
147 base::MessageLoopProxy::current().get(), 149 base::ThreadTaskRunnerHandle::Get().get(),
148 fake_free_disk_space_getter_.get())); 150 fake_free_disk_space_getter_.get()));
149 ASSERT_TRUE(cache_->Initialize()); 151 ASSERT_TRUE(cache_->Initialize());
150 152
151 resource_metadata_.reset(new ResourceMetadata( 153 resource_metadata_.reset(new ResourceMetadata(
152 metadata_storage_.get(), cache_.get(), 154 metadata_storage_.get(), cache_.get(),
153 base::MessageLoopProxy::current())); 155 base::ThreadTaskRunnerHandle::Get()));
154 156
155 ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize()); 157 ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
156 158
157 SetUpEntries(resource_metadata_.get()); 159 SetUpEntries(resource_metadata_.get());
158 } 160 }
159 161
160 base::ScopedTempDir temp_dir_; 162 base::ScopedTempDir temp_dir_;
161 content::TestBrowserThreadBundle thread_bundle_; 163 content::TestBrowserThreadBundle thread_bundle_;
162 scoped_ptr<ResourceMetadataStorage, test_util::DestroyHelperForTests> 164 scoped_ptr<ResourceMetadataStorage, test_util::DestroyHelperForTests>
163 metadata_storage_; 165 metadata_storage_;
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 700
699 // The "trash" directory should be empty. 701 // The "trash" directory should be empty.
700 ASSERT_EQ(FILE_ERROR_OK, 702 ASSERT_EQ(FILE_ERROR_OK,
701 resource_metadata_->ReadDirectoryByPath( 703 resource_metadata_->ReadDirectoryByPath(
702 base::FilePath::FromUTF8Unsafe("drive/trash"), &entries)); 704 base::FilePath::FromUTF8Unsafe("drive/trash"), &entries));
703 EXPECT_TRUE(entries.empty()); 705 EXPECT_TRUE(entries.empty());
704 } 706 }
705 707
706 } // namespace internal 708 } // namespace internal
707 } // namespace drive 709 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698