Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/chromeos/drive/file_system_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 827 matching lines @@
 TEST_F(FileSystemTest, ReadDirectoryAfterUpdateWhileLoading) {
   // Simulate the situation that full feed fetching takes very long time,
   // to test the recursive "fast fetch" feature is properly working.
   fake_drive_service_->set_never_return_all_file_list(true);
 
   // On the fake server, create the test directory.
   scoped_ptr<google_apis::FileResource> parent;
   {
     google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
     fake_drive_service_->AddNewDirectory(
-        fake_drive_service_->GetRootResourceId(),
-        "UpdateWhileLoadingTestDir",
-        DriveServiceInterface::AddNewDirectoryOptions(),
+        fake_drive_service_->GetRootResourceId(), "UpdateWhileLoadingTestDir",
+        AddNewDirectoryOptions(),
         google_apis::test_util::CreateCopyResultCallback(&error, &parent));
     base::RunLoop().RunUntilIdle();
     ASSERT_EQ(google_apis::HTTP_CREATED, error);
   }
 
   // Fetch the directory. Currently it is empty.
   scoped_ptr<ResourceEntryVector> before = ReadDirectorySync(base::FilePath(
       FILE_PATH_LITERAL("drive/root/UpdateWhileLoadingTestDir")));
   ASSERT_TRUE(before);
   EXPECT_EQ(0u, before->size());
@@ skipping 190 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(&available));
   content::RunAllBlockingPoolTasksUntilIdle();
   ASSERT_FALSE(available);
 
   entry = GetResourceEntrySync(file_in_root);
   ASSERT_TRUE(entry);
   EXPECT_FALSE(entry->file_specific_info().cache_state().is_present());
 }
 
 }   // namespace drive