Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc

 // Copyright 2014 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 "base/path_service.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ skipping 93 matching lines @@
         google_apis::test_util::CreateCopyResultCallback(&error, &entry));
     content::RunAllPendingInMessageLoop();
     return error == google_apis::HTTP_CREATED && entry;
   }
 
   std::string AddTestDirectory(const std::string& title,
                                const std::string& parent_id) {
     scoped_ptr<google_apis::FileResource> entry;
     google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
     fake_drive_service_->AddNewDirectory(
-        parent_id, title,
-        drive::DriveServiceInterface::AddNewDirectoryOptions(),
+        parent_id, title, drive::AddNewDirectoryOptions(),
         google_apis::test_util::CreateCopyResultCallback(&error, &entry));
     content::RunAllPendingInMessageLoop();
     return error == google_apis::HTTP_CREATED && entry ? entry->file_id() : "";
   }
 
   base::ScopedTempDir test_cache_root_;
   drive::FakeDriveService* fake_drive_service_;
   drive::DriveIntegrationService* integration_service_;
   drive::DriveIntegrationServiceFactory::FactoryCallback
       create_drive_integration_service_;
@@ skipping 129 matching lines @@
     FileSystemApiSaveExistingFileWithWriteTest) {
   base::FilePath test_file = drive::util::GetDriveMountPointPath(
       browser()->profile()).AppendASCII("root/save_existing.txt");
   FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
       &test_file);
   ASSERT_TRUE(RunPlatformAppTest(
       "api_test/file_system/save_existing_with_write")) << message_;
 }
 
 }  // namespace extensions