Move Drive API files to google_apis directory

chrome/browser/google_apis/drive_uploader.cc

Index: chrome/browser/google_apis/drive_uploader.cc
diff --git a/chrome/browser/chromeos/gdata/drive_uploader.cc b/chrome/browser/google_apis/drive_uploader.cc
similarity index 98%
rename from chrome/browser/chromeos/gdata/drive_uploader.cc
rename to chrome/browser/google_apis/drive_uploader.cc
index 059ff6ceedf4b8a19e31c6d0c5f6614464f5b525..c7b6e8be28104529aa23adc69393bf9fdeb7a010 100644
--- a/chrome/browser/chromeos/gdata/drive_uploader.cc
+++ b/chrome/browser/google_apis/drive_uploader.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_uploader.h"
+#include "chrome/browser/google_apis/drive_uploader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/string_number_conversions.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
+#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "net/base/file_stream.h"
@@ -542,11 +542,11 @@ int64 DriveUploader::UploadFileInfo::SizeRemaining() const {
 
 std::string DriveUploader::UploadFileInfo::DebugString() const {
   return "title=[" + title +
-         "], file_path=[" + file_path.value() +
+         "], file_path=[" + file_path.AsUTF8Unsafe() +
          "], content_type=[" + content_type +
          "], content_length=[" + base::UintToString(content_length) +
          "], file_size=[" + base::UintToString(file_size) +
-         "], drive_path=[" + drive_path.value() +
+         "], drive_path=[" + drive_path.AsUTF8Unsafe() +
          "]";
 }