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

chrome/browser/drive/drive_app_registry.cc

 // Copyright (c) 2012 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/chromeos/drive/drive_app_registry.h"
+#include "chrome/browser/drive/drive_app_registry.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "chrome/browser/drive/drive_service_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/drive_api_parser.h"
 
@@ skipping 52 matching lines @@
 }
 
 void DriveAppRegistry::GetAppsForFile(
     const base::FilePath::StringType& file_extension,
     const std::string& mime_type,
     std::vector<DriveAppInfo>* apps) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   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())
     FindAppsForSelector(mime_type, mimetype_map_, &matched_apps);
 
   // Insert found Drive apps into |apps|, but skip duplicate results.
   std::set<std::string> inserted_app_ids;
   for (size_t i = 0; i < matched_apps.size(); ++i) {
     if (inserted_app_ids.count(matched_apps[i]) == 0) {
       inserted_app_ids.insert(matched_apps[i]);
@@ skipping 82 matching lines @@
 
   // Go forward while the size is larger or equal to preferred_size.
   size_t i = 1;
   while (i < sorted_icons.size() && sorted_icons[i].first >= preferred_size)
     ++i;
   return sorted_icons[i - 1].second;
 }
 
 }  // namespace util
 }  // namespace drive