Move DriveAppRegistry from c/b/chromeos/drive to c/b/drive.

chrome/browser/drive/drive_app_registry.cc

Index: chrome/browser/drive/drive_app_registry.cc
diff --git a/chrome/browser/chromeos/drive/drive_app_registry.cc b/chrome/browser/drive/drive_app_registry.cc
similarity index 97%
rename from chrome/browser/chromeos/drive/drive_app_registry.cc
rename to chrome/browser/drive/drive_app_registry.cc
index 4043edd406239f412960b6edb9680948f4be6847..983228dff3532715d8fff1770552496e97601968 100644
--- a/chrome/browser/chromeos/drive/drive_app_registry.cc
+++ b/chrome/browser/drive/drive_app_registry.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/drive/drive_app_registry.h"
+#include "chrome/browser/drive/drive_app_registry.h"
 
 #include <algorithm>
 #include <set>
@@ -75,7 +75,8 @@ void DriveAppRegistry::GetAppsForFile(
 
   std::vector<std::string> matched_apps;
   if (!file_extension.empty()) {
-    const base::FilePath::StringType without_dot = file_extension.substr(1);
+    const std::string without_dot =
+        base::FilePath(file_extension.substr(1)).AsUTF8Unsafe();
     FindAppsForSelector(without_dot, extension_map_, &matched_apps);
   }
   if (!mime_type.empty())