Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/chromeos/drive/file_system/search_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/search_operation.h"
 
 #include "base/callback_helpers.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/drive/fake_drive_service.h"
@@ skipping 38 matching lines @@
 }
 
 TEST_F(SearchOperationTest, ContentSearchWithNewEntry) {
   SearchOperation operation(blocking_task_runner(), scheduler(), metadata(),
                             loader_controller());
 
   // Create a new directory in the drive service.
   google_apis::DriveApiErrorCode status = google_apis::DRIVE_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> server_entry;
   fake_service()->AddNewDirectory(
-      fake_service()->GetRootResourceId(),
-      "New Directory 1!",
-      DriveServiceInterface::AddNewDirectoryOptions(),
+      fake_service()->GetRootResourceId(), "New Directory 1!",
+      AddNewDirectoryOptions(),
       google_apis::test_util::CreateCopyResultCallback(&status, &server_entry));
   content::RunAllBlockingPoolTasksUntilIdle();
   ASSERT_EQ(google_apis::HTTP_CREATED, status);
 
   // As the result of the first Search(), only entries in the current file
   // system snapshot are expected to be returned in the "right" path. New
   // entries like "New Directory 1!" is temporarily added to "drive/other".
   std::set<std::string> expected_results;
   expected_results.insert("drive/root/Directory 1");
   expected_results.insert("drive/other/New Directory 1!");
@@ skipping 77 matching lines @@
   // Unlock, this should resume the pending search.
   lock.reset();
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
   ASSERT_TRUE(results);
   EXPECT_EQ(1u, results->size());
 }
 
 }  // namespace file_system
 }  // namespace drive