Revert of Implement DriveAppRegistry::UninstallApp() and GetAppList().

chrome/browser/drive/drive_app_registry.cc

 // Copyright 2014 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/drive/drive_app_registry.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 17 matching lines @@
 // Append list of app ids in |map| looked up by |selector| to |matched_apps|.
 void FindAppsForSelector(const std::string& selector,
                          const std::multimap<std::string, std::string>& map,
                          std::vector<std::string>* matched_apps) {
   typedef std::multimap<std::string, std::string>::const_iterator iterator;
   std::pair<iterator, iterator> range = map.equal_range(selector);
   for (iterator it = range.first; it != range.second; ++it)
     matched_apps->push_back(it->second);
 }
 
-void RemoveAppFromSelector(const std::string& app_id,
-                           std::multimap<std::string, std::string>* map) {
-  typedef std::multimap<std::string, std::string>::iterator iterator;
-  for (iterator it = map->begin(); it != map->end(); ) {
-    iterator now = it++;
-    if (now->second == app_id)
-      map->erase(now);
-  }
-}
-
 }  // namespace
 
 namespace drive {
 
 DriveAppInfo::DriveAppInfo() {
 }
 
 DriveAppInfo::DriveAppInfo(
     const std::string& app_id,
     const google_apis::InstalledApp::IconList& app_icons,
@@ skipping 40 matching lines @@
     if (inserted_app_ids.count(matched_apps[i]) == 0) {
       inserted_app_ids.insert(matched_apps[i]);
       std::map<std::string, DriveAppInfo>::const_iterator it =
           all_apps_.find(matched_apps[i]);
       DCHECK(it != all_apps_.end());
       apps->push_back(it->second);
     }
   }
 }
 
-void DriveAppRegistry::GetAppList(std::vector<DriveAppInfo>* apps) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  apps->clear();
-  for (std::map<std::string, DriveAppInfo>::const_iterator
-          it = all_apps_.begin(); it != all_apps_.end(); ++it) {
-    apps->push_back(it->second);
-  }
-}
-
 void DriveAppRegistry::Update() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (is_updating_)  // There is already an update in progress.
     return;
   is_updating_ = true;
 
   drive_service_->GetAppList(
       base::Bind(&DriveAppRegistry::UpdateAfterGetAppList,
                  weak_ptr_factory_.GetWeakPtr()));
@@ skipping 45 matching lines @@
                                  app.create_url());
 
     // TODO(kinaba): consider taking primary/secondary distinction into account.
     AddAppSelectorList(app.primary_mimetypes(), id, &mimetype_map_);
     AddAppSelectorList(app.secondary_mimetypes(), id, &mimetype_map_);
     AddAppSelectorList(app.primary_file_extensions(), id, &extension_map_);
     AddAppSelectorList(app.secondary_file_extensions(), id, &extension_map_);
   }
 }
 
-void DriveAppRegistry::UninstallApp(const std::string& app_id,
-                                    const UninstallCallback& callback) {
-  DCHECK(!callback.is_null());
-
-  drive_service_->UninstallApp(app_id,
-                               base::Bind(&DriveAppRegistry::OnAppUninstalled,
-                                          weak_ptr_factory_.GetWeakPtr(),
-                                          app_id,
-                                          callback));
-}
-
-void DriveAppRegistry::OnAppUninstalled(const std::string& app_id,
-                                        const UninstallCallback& callback,
-                                        google_apis::GDataErrorCode error) {
-  if (error == google_apis::HTTP_SUCCESS) {
-    all_apps_.erase(app_id);
-    RemoveAppFromSelector(app_id, &mimetype_map_);
-    RemoveAppFromSelector(app_id, &extension_map_);
-  }
-  callback.Run(error);
-}
-
-// static
-bool DriveAppRegistry::IsAppUninstallSupported() {
-#ifdef USE_OFFICIAL_GOOGLE_API_KEYS
-  return true;
-#else
-  return false;
-#endif
-}
-
 namespace util {
 
 GURL FindPreferredIcon(const google_apis::InstalledApp::IconList& icons,
                        int preferred_size) {
   if (icons.empty())
     return GURL();
 
   google_apis::InstalledApp::IconList sorted_icons = icons;
   std::sort(sorted_icons.rbegin(), sorted_icons.rend());
 
   // 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