Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_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/sync_file_system/drive_backend/sync_engine_initializer.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 116 matching lines @@
     app_root_list.weak_clear();
     return status;
   }
 
   scoped_ptr<google_apis::FileResource> CreateRemoteFolder(
       const std::string& parent_folder_id,
       const std::string& title) {
     google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
     scoped_ptr<google_apis::FileResource> entry;
     sync_context_->GetDriveService()->AddNewDirectory(
-        parent_folder_id, title,
-        drive::DriveServiceInterface::AddNewDirectoryOptions(),
+        parent_folder_id, title, drive::AddNewDirectoryOptions(),
         CreateResultReceiver(&error, &entry));
     base::RunLoop().RunUntilIdle();
 
     EXPECT_EQ(google_apis::HTTP_CREATED, error);
     return entry.Pass();
   }
 
   scoped_ptr<google_apis::FileResource> CreateRemoteSyncRoot() {
     scoped_ptr<google_apis::FileResource> sync_root(
         CreateRemoteFolder(std::string(), kSyncRootFolderTitle));
@@ skipping 192 matching lines @@
 
   EXPECT_EQ(0u, CountTrackersForFile(sync_root->file_id()));
   EXPECT_FALSE(HasNoParent(sync_root->file_id()));
 
   EXPECT_EQ(1u, CountFileMetadata());
   EXPECT_EQ(1u, CountFileTracker());
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system