Move Drive API files to google_apis directory

chrome/browser/google_apis/gdata_wapi_parser.cc

Index: chrome/browser/google_apis/gdata_wapi_parser.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc
similarity index 99%
rename from chrome/browser/chromeos/gdata/gdata_wapi_parser.cc
rename to chrome/browser/google_apis/gdata_wapi_parser.cc
index 3a1d685e19eccb80f8230fbe8fe77e98da1cbf0b..b5728e369740dc97c436eddafedcea9b5edac716 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_parser.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser.cc
@@ -2,7 +2,7 @@
 // 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/gdata_wapi_parser.h"
+#include "chrome/browser/google_apis/gdata_wapi_parser.h"
 
 #include <algorithm>
 
@@ -15,8 +15,8 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/gdata/drive_api_parser.h"
-#include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/google_apis/drive_api_parser.h"
+#include "chrome/browser/google_apis/gdata_util.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
 using base::Value;
@@ -649,9 +649,14 @@ std::string DocumentEntry::GetHostedDocumentExtension() const {
 
 // static
 bool DocumentEntry::HasHostedDocumentExtension(const FilePath& file) {
-  FilePath::StringType file_extension = file.Extension();
+#if defined(OS_WIN)
+  std::string file_extension = WideToUTF8(file.Extension());
+#else
+  std::string file_extension = file.Extension();
+#endif
   for (size_t i = 0; i < arraysize(kEntryKindMap); ++i) {
     const char* document_extension = kEntryKindMap[i].extension;
+
     if (document_extension && file_extension == document_extension)
       return true;
   }