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

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

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 (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/file_system.h" 5 #include "chrome/browser/chromeos/drive/file_system.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 scheduler_.reset(new JobScheduler(profile_.get(), 82 scheduler_.reset(new JobScheduler(profile_.get(),
83 fake_drive_service_.get())); 83 fake_drive_service_.get()));
84 84
85 scoped_refptr<base::SequencedWorkerPool> pool = 85 scoped_refptr<base::SequencedWorkerPool> pool =
86 content::BrowserThread::GetBlockingPool(); 86 content::BrowserThread::GetBlockingPool();
87 blocking_task_runner_ = 87 blocking_task_runner_ =
88 pool->GetSequencedTaskRunner(pool->GetSequenceToken()); 88 pool->GetSequencedTaskRunner(pool->GetSequenceToken());
89 89
90 cache_.reset(new internal::FileCache(util::GetCacheRootPath(profile_.get()), 90 cache_.reset(new internal::FileCache(util::GetCacheRootPath(profile_.get()),
91 blocking_task_runner_, 91 blocking_task_runner_.get(),
92 fake_free_disk_space_getter_.get())); 92 fake_free_disk_space_getter_.get()));
93 93
94 mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>); 94 mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>);
95 95
96 bool success = false; 96 bool success = false;
97 cache_->RequestInitialize( 97 cache_->RequestInitialize(
98 google_apis::test_util::CreateCopyResultCallback(&success)); 98 google_apis::test_util::CreateCopyResultCallback(&success));
99 google_apis::test_util::RunBlockingPoolTask(); 99 google_apis::test_util::RunBlockingPoolTask();
100 ASSERT_TRUE(success); 100 ASSERT_TRUE(success);
101 101
102 SetUpResourceMetadataAndFileSystem(); 102 SetUpResourceMetadataAndFileSystem();
103 } 103 }
104 104
105 void SetUpResourceMetadataAndFileSystem() { 105 void SetUpResourceMetadataAndFileSystem() {
106 resource_metadata_.reset(new internal::ResourceMetadata( 106 resource_metadata_.reset(new internal::ResourceMetadata(
107 cache_->GetCacheDirectoryPath(internal::FileCache::CACHE_TYPE_META), 107 cache_->GetCacheDirectoryPath(internal::FileCache::CACHE_TYPE_META),
108 blocking_task_runner_)); 108 blocking_task_runner_));
109 109
110 file_system_.reset(new FileSystem(profile_.get(), 110 file_system_.reset(new FileSystem(profile_.get(),
111 cache_.get(), 111 cache_.get(),
112 fake_drive_service_.get(), 112 fake_drive_service_.get(),
113 scheduler_.get(), 113 scheduler_.get(),
114 resource_metadata_.get(), 114 resource_metadata_.get(),
115 blocking_task_runner_)); 115 blocking_task_runner_.get()));
116 file_system_->AddObserver(mock_directory_observer_.get()); 116 file_system_->AddObserver(mock_directory_observer_.get());
117 file_system_->Initialize(); 117 file_system_->Initialize();
118 118
119 // Disable delaying so that the sync starts immediately. 119 // Disable delaying so that the sync starts immediately.
120 file_system_->sync_client_for_testing()->set_delay_for_testing( 120 file_system_->sync_client_for_testing()->set_delay_for_testing(
121 base::TimeDelta::FromSeconds(0)); 121 base::TimeDelta::FromSeconds(0));
122 122
123 FileError error = FILE_ERROR_FAILED; 123 FileError error = FILE_ERROR_FAILED;
124 resource_metadata_->Initialize( 124 resource_metadata_->Initialize(
125 google_apis::test_util::CreateCopyResultCallback(&error)); 125 google_apis::test_util::CreateCopyResultCallback(&error));
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 entry->resource_id(), 900 entry->resource_id(),
901 entry->file_specific_info().md5(), 901 entry->file_specific_info().md5(),
902 google_apis::test_util::CreateCopyResultCallback(&success, &cache_entry)); 902 google_apis::test_util::CreateCopyResultCallback(&success, &cache_entry));
903 google_apis::test_util::RunBlockingPoolTask(); 903 google_apis::test_util::RunBlockingPoolTask();
904 904
905 EXPECT_TRUE(success); 905 EXPECT_TRUE(success);
906 EXPECT_FALSE(cache_entry.is_mounted()); 906 EXPECT_FALSE(cache_entry.is_mounted());
907 } 907 }
908 908
909 } // namespace drive 909 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698