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

Side by Side Diff: chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc

Issue 14118006: Change owner of DriveScheduler from DriveFileSystem to DriveSystemService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/chromeos/drive/file_system/create_directory_operation.h " 5 #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h "
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/threading/sequenced_worker_pool.h" 9 #include "base/threading/sequenced_worker_pool.h"
10 #include "chrome/browser/chromeos/drive/change_list_loader.h" 10 #include "chrome/browser/chromeos/drive/change_list_loader.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 blocking_task_runner_)); 50 blocking_task_runner_));
51 51
52 DriveFileError error = DRIVE_FILE_ERROR_FAILED; 52 DriveFileError error = DRIVE_FILE_ERROR_FAILED;
53 metadata_->Initialize( 53 metadata_->Initialize(
54 google_apis::test_util::CreateCopyResultCallback(&error)); 54 google_apis::test_util::CreateCopyResultCallback(&error));
55 google_apis::test_util::RunBlockingPoolTask(); 55 google_apis::test_util::RunBlockingPoolTask();
56 ASSERT_EQ(DRIVE_FILE_OK, error); 56 ASSERT_EQ(DRIVE_FILE_OK, error);
57 57
58 scheduler_.reset( 58 scheduler_.reset(
59 new DriveScheduler(profile_.get(), fake_drive_service_.get())); 59 new DriveScheduler(profile_.get(), fake_drive_service_.get()));
60 scheduler_->Initialize();
61 60
62 DriveWebAppsRegistry drive_web_apps_registry; 61 DriveWebAppsRegistry drive_web_apps_registry;
63 ChangeListLoader change_list_loader( 62 ChangeListLoader change_list_loader(
64 metadata_.get(), scheduler_.get(), &drive_web_apps_registry); 63 metadata_.get(), scheduler_.get(), &drive_web_apps_registry);
65 64
66 // Makes sure the FakeDriveService's content is loaded to the metadata_. 65 // Makes sure the FakeDriveService's content is loaded to the metadata_.
67 change_list_loader.LoadIfNeeded( 66 change_list_loader.LoadIfNeeded(
68 DirectoryFetchInfo(), 67 DirectoryFetchInfo(),
69 google_apis::test_util::CreateCopyResultCallback(&error)); 68 google_apis::test_util::CreateCopyResultCallback(&error));
70 google_apis::test_util::RunBlockingPoolTask(); 69 google_apis::test_util::RunBlockingPoolTask();
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 operation()->FindFirstMissingParentDirectory( 160 operation()->FindFirstMissingParentDirectory(
162 base::FilePath(FILE_PATH_LITERAL("drive/root/Directory 1")), 161 base::FilePath(FILE_PATH_LITERAL("drive/root/Directory 1")),
163 google_apis::test_util::CreateCopyResultCallback(&result)); 162 google_apis::test_util::CreateCopyResultCallback(&result));
164 google_apis::test_util::RunBlockingPoolTask(); 163 google_apis::test_util::RunBlockingPoolTask();
165 EXPECT_EQ(CreateDirectoryOperation::FIND_FIRST_DIRECTORY_ALREADY_PRESENT, 164 EXPECT_EQ(CreateDirectoryOperation::FIND_FIRST_DIRECTORY_ALREADY_PRESENT,
166 result.error); 165 result.error);
167 } 166 }
168 167
169 } // namespace file_system 168 } // namespace file_system
170 } // namespace drive 169 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698