diff options
Diffstat (limited to 'chrome/browser/chromeos/drive')
18 files changed, 34 insertions, 34 deletions
diff --git a/chrome/browser/chromeos/drive/download_handler_unittest.cc b/chrome/browser/chromeos/drive/download_handler_unittest.cc index 3a0db7f0..5cba3ec 100644 --- a/chrome/browser/chromeos/drive/download_handler_unittest.cc +++ b/chrome/browser/chromeos/drive/download_handler_unittest.cc @@ -68,7 +68,7 @@ class DownloadHandlerTest : public testing::Test { protected: base::ScopedTempDir temp_dir_; - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_refptr<content::MockDownloadManager> download_manager_; MockFileSystem file_system_; diff --git a/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc b/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc index 2d9dff7..5363193 100644 --- a/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc @@ -86,7 +86,7 @@ class DriveAppRegistryTest : public testing::Test { is_primary); } - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc index 303dd3e..f266d21 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc @@ -59,7 +59,7 @@ class LocalReaderProxyTest : public ::testing::Test { worker_thread_.reset(); } - MessageLoopForIO message_loop_; + base::MessageLoopForIO message_loop_; content::TestBrowserThread io_thread_; base::ScopedTempDir temp_dir_; @@ -112,7 +112,7 @@ class NetworkReaderProxyTest : public ::testing::Test { NetworkReaderProxyTest() : io_thread_(BrowserThread::IO, &message_loop_) { } - MessageLoopForIO message_loop_; + base::MessageLoopForIO message_loop_; content::TestBrowserThread io_thread_; }; @@ -348,7 +348,7 @@ class DriveFileStreamReaderTest : public ::testing::Test { base::Unretained(this)); } - MessageLoopForIO message_loop_; + base::MessageLoopForIO message_loop_; content::TestBrowserThread ui_thread_; content::TestBrowserThread io_thread_; diff --git a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc index e84bedb..826f09f 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc @@ -36,7 +36,7 @@ class DriveIntegrationServiceTest : public testing::Test { } protected: - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_ptr<TestingProfile> profile_; scoped_ptr<DriveIntegrationService> integration_service_; diff --git a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc index 5274ce4..c5ca7df 100644 --- a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc @@ -202,7 +202,7 @@ class DriveURLRequestJobTest : public testing::Test { return true; } - MessageLoopForIO message_loop_; + base::MessageLoopForIO message_loop_; content::TestBrowserThread ui_thread_; content::TestBrowserThread io_thread_; @@ -222,7 +222,7 @@ TEST_F(DriveURLRequestJobTest, NonGetMethod) { request.set_method("POST"); // Set non "GET" method. request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); EXPECT_EQ(net::ERR_METHOD_NOT_SUPPORTED, request.status().error()); @@ -239,7 +239,7 @@ TEST_F(DriveURLRequestJobTest, RegularFile) { url_request_context_.get(), test_network_delegate_.get()); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); // It looks weird, but the mime type for the "File 1.txt" is "audio/mpeg" @@ -264,7 +264,7 @@ TEST_F(DriveURLRequestJobTest, RegularFile) { url_request_context_.get(), test_network_delegate_.get()); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); std::string mime_type; @@ -286,7 +286,7 @@ TEST_F(DriveURLRequestJobTest, HostedDocument) { url_request_context_.get(), test_network_delegate_.get()); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); // Make sure that a hosted document triggers redirection. @@ -301,7 +301,7 @@ TEST_F(DriveURLRequestJobTest, RootDirectory) { url_request_context_.get(), test_network_delegate_.get()); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); EXPECT_EQ(net::ERR_FAILED, request.status().error()); @@ -313,7 +313,7 @@ TEST_F(DriveURLRequestJobTest, Directory) { url_request_context_.get(), test_network_delegate_.get()); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); EXPECT_EQ(net::ERR_FAILED, request.status().error()); @@ -325,7 +325,7 @@ TEST_F(DriveURLRequestJobTest, NonExistingFile) { url_request_context_.get(), test_network_delegate_.get()); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()); @@ -337,7 +337,7 @@ TEST_F(DriveURLRequestJobTest, WrongFormat) { url_request_context_.get(), test_network_delegate_.get()); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); EXPECT_EQ(net::ERR_INVALID_URL, request.status().error()); @@ -352,7 +352,7 @@ TEST_F(DriveURLRequestJobTest, Cancel) { request.Start(); request.Cancel(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::CANCELED, request.status().status()); } @@ -370,7 +370,7 @@ TEST_F(DriveURLRequestJobTest, RangeHeader) { "Range", "bytes=3-5", false /* overwrite */); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); @@ -393,7 +393,7 @@ TEST_F(DriveURLRequestJobTest, WrongRangeHeader) { "Range", "Wrong Range Header Value", false /* overwrite */); request.Start(); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE, request.status().error()); diff --git a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc index d00bd76..3d3384a 100644 --- a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc @@ -36,7 +36,7 @@ class FakeFileSystemTest : public ::testing::Test { ASSERT_TRUE(fake_file_system_->InitializeForTesting()); } - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_ptr<google_apis::FakeDriveService> fake_drive_service_; diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc index 5a63b0d..151bdb2 100644 --- a/chrome/browser/chromeos/drive/file_cache_unittest.cc +++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc @@ -522,7 +522,7 @@ class FileCacheTest : public testing::Test { return num_files_found; } - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; base::ScopedTempDir temp_dir_; @@ -1264,7 +1264,7 @@ TEST_F(FileCacheTest, StoreToCacheNoSpace) { // Don't use TEST_F, as we don't want SetUp() and TearDown() for this test. TEST(FileCacheExtraTest, InitializationFailure) { - MessageLoopForUI message_loop; + base::MessageLoopForUI message_loop; content::TestBrowserThread ui_thread(content::BrowserThread::UI, &message_loop); diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h index fb1b6c2..7d320c5 100644 --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h @@ -89,7 +89,7 @@ class OperationTestBase : public testing::Test { internal::FileCache* cache() { return cache_.get(); } private: - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc index caadf8c..b2e09c2 100644 --- a/chrome/browser/chromeos/drive/file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_unittest.cc @@ -47,7 +47,7 @@ const int64 kLotsOfSpace = internal::kMinFreeSpace * 10; // 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, + int* counter, int expected_counter, base::MessageLoop* message_loop, FileError error, scoped_ptr<ResourceEntry> entry) { if (error != FILE_ERROR_OK || !entry) { // If we hit an error case, quit the message loop immediately. @@ -367,7 +367,7 @@ class FileSystemTest : public testing::Test { EXPECT_EQ(entry.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_; diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc index 4639bb2..93a8720 100644 --- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc @@ -92,7 +92,7 @@ TEST(FileSystemUtilTest, ExtractDrivePathFromFileSystemUrl) { base::ScopedTempDir temp_dir_; ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - MessageLoop message_loop; + base::MessageLoop message_loop; scoped_refptr<fileapi::ExternalMountPoints> mount_points = fileapi::ExternalMountPoints::CreateRefCounted(); scoped_refptr<fileapi::FileSystemContext> context( diff --git a/chrome/browser/chromeos/drive/file_write_helper_unittest.cc b/chrome/browser/chromeos/drive/file_write_helper_unittest.cc index bb68996..4a80cec 100644 --- a/chrome/browser/chromeos/drive/file_write_helper_unittest.cc +++ b/chrome/browser/chromeos/drive/file_write_helper_unittest.cc @@ -77,7 +77,7 @@ class FileWriteHelperTest : public testing::Test { } protected: - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_ptr<TestFileSystem> test_file_system_; }; diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc index d455fd8b..0cf8546 100644 --- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc +++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc @@ -161,7 +161,7 @@ class JobSchedulerTest : public testing::Test { ChangeConnectionType(net::NetworkChangeNotifier::CONNECTION_NONE); } - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_ptr<TestingProfile> profile_; scoped_ptr<JobScheduler> scheduler_; diff --git a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc index 43b6ce5..dd8acf4 100644 --- a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc @@ -60,7 +60,7 @@ class LocalFileReaderTest : public ::testing::Test { worker_thread_.reset(); } - MessageLoop message_loop_; + base::MessageLoop message_loop_; base::ScopedTempDir temp_dir_; scoped_ptr<base::Thread> worker_thread_; scoped_ptr<LocalFileReader> file_reader_; diff --git a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc index 1d3d51e..6c46169 100644 --- a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc +++ b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc @@ -54,7 +54,7 @@ class RemoveStaleCacheFilesTest : public testing::Test { ASSERT_EQ(FILE_ERROR_OK, error); } - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; base::ScopedTempDir temp_dir_; diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc index dc5a945..71ac23a 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc @@ -216,7 +216,7 @@ class ResourceMetadataTestOnUIThread : public testing::Test { resource_metadata_; private: - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; }; @@ -1198,7 +1198,7 @@ class ResourceMetadataTest : public testing::Test { } base::ScopedTempDir temp_dir_; - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> resource_metadata_; diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc index ec892ff..0362d6e 100644 --- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc @@ -215,7 +215,7 @@ class SearchMetadataTest : public testing::Test { EXPECT_EQ(FILE_ERROR_OK, error); } - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; base::ScopedTempDir temp_dir_; scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_; diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc index d88d687..e41bf43 100644 --- a/chrome/browser/chromeos/drive/sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc @@ -215,7 +215,7 @@ class SyncClientTest : public testing::Test { } protected: - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; base::ScopedTempDir temp_dir_; scoped_ptr<StrictMock<MockFileSystem> > mock_file_system_; diff --git a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc index 8064fc2..687bd52 100644 --- a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc +++ b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc @@ -96,7 +96,7 @@ class WebkitFileStreamReaderImplTest : public ::testing::Test { base::Unretained(this)); } - MessageLoopForIO message_loop_; + base::MessageLoopForIO message_loop_; content::TestBrowserThread ui_thread_; content::TestBrowserThread io_thread_; |