| Index: chrome/browser/chromeos/drive/drive_file_system_unittest.cc
|
| diff --git a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
|
| index db7c0815597191f9ebed6bd64d86cc134ea5a3b0..4bd94b977279e3cc93861bfe6df7b0caad02f886 100644
|
| --- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
|
| +++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
|
| @@ -52,14 +52,13 @@ struct SearchResultPair {
|
|
|
| // Callback to DriveFileSystem::Search used in ContentSearch tests.
|
| // Verifies returned vector of results and next feed url.
|
| -void DriveSearchCallback(
|
| - MessageLoop* message_loop,
|
| - const SearchResultPair* expected_results,
|
| - size_t expected_results_size,
|
| - const GURL& expected_next_feed,
|
| - FileError error,
|
| - const GURL& next_feed,
|
| - scoped_ptr<std::vector<SearchResultInfo> > results) {
|
| +void DriveSearchCallback(base::MessageLoop* message_loop,
|
| + const SearchResultPair* expected_results,
|
| + size_t expected_results_size,
|
| + const GURL& expected_next_feed,
|
| + FileError error,
|
| + const GURL& next_feed,
|
| + scoped_ptr<std::vector<SearchResultInfo> > results) {
|
| ASSERT_TRUE(results);
|
| ASSERT_EQ(expected_results_size, results->size());
|
|
|
| @@ -87,9 +86,11 @@ int CountFiles(const DriveEntryProtoVector& entries) {
|
|
|
| // Counts the number of invocation, and if it increased up to |expected_counter|
|
| // quits the current message loop.
|
| -void AsyncInitializationCallback(
|
| - int* counter, int expected_counter, MessageLoop* message_loop,
|
| - FileError error, scoped_ptr<DriveEntryProto> entry) {
|
| +void AsyncInitializationCallback(int* counter,
|
| + int expected_counter,
|
| + base::MessageLoop* message_loop,
|
| + FileError error,
|
| + scoped_ptr<DriveEntryProto> entry) {
|
| if (error != FILE_ERROR_OK || !entry) {
|
| // If we hit an error case, quit the message loop immediately.
|
| // Then the expectation in the test case can find it because the actual
|
| @@ -441,7 +442,7 @@ class DriveFileSystemTest : public testing::Test {
|
| EXPECT_EQ(entry_proto.resource_id(), resource_id);
|
| }
|
|
|
| - MessageLoopForUI message_loop_;
|
| + base::MessageLoopForUI message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
| scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
|
| scoped_ptr<TestingProfile> profile_;
|
|
|