Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc

 // Copyright 2013 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/copy_operation.h"
 
 #include "base/files/file_util.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_change.h"
@@ skipping 467 matching lines @@
                    google_apis::test_util::CreateCopyResultCallback(
                        &copy_error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(directory_local_id, waited_local_id);
   ASSERT_FALSE(pending_callback.is_null());
 
   // Add a new directory to the server and store the resource ID locally.
   google_apis::DriveApiErrorCode status = google_apis::DRIVE_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> file_resource;
   fake_service()->AddNewDirectory(
-      directory_parent.resource_id(),
-      directory.title(),
-      DriveServiceInterface::AddNewDirectoryOptions(),
-      google_apis::test_util::CreateCopyResultCallback(
-          &status, &file_resource));
+      directory_parent.resource_id(), directory.title(),
+      AddNewDirectoryOptions(),
+      google_apis::test_util::CreateCopyResultCallback(&status,
+                                                       &file_resource));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(google_apis::HTTP_CREATED, status);
   ASSERT_TRUE(file_resource);
 
   directory.set_local_id(directory_local_id);
   directory.set_resource_id(file_resource->file_id());
   base::PostTaskAndReplyWithResult(
       blocking_task_runner(),
       FROM_HERE,
       base::Bind(&internal::ResourceMetadata::RefreshEntry,
                  base::Unretained(metadata()), directory),
       google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Resume the copy operation.
   pending_callback.Run(FILE_ERROR_OK);
   content::RunAllBlockingPoolTasksUntilIdle();
 
   EXPECT_EQ(FILE_ERROR_OK, copy_error);
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(dest_path, &entry));
 }
 
 }  // namespace file_system
 }  // namespace drive