Remove PluginFinder async interface

chrome/browser/plugins/plugin_finder.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/plugins/plugin_finder.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/plugins/plugin_installer.h"
+#include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
@@ skipping 23 matching lines @@
   FilePath::StringType path = plugin.path.BaseName().RemoveExtension().value();
 #if defined(OS_POSIX)
   return UTF8ToUTF16(path);
 #elif defined(OS_WIN)
   return WideToUTF16(path);
 #endif
 }
 
 }  // namespace
 
-// TODO(ibraaaa): DELETE. http://crbug.com/124396
-// static
-void PluginFinder::Get(const base::Callback<void(PluginFinder*)>& cb) {
-  // At a later point we might want to do intialization here that needs to be
-  // done asynchronously, like loading the plug-in list from disk or from a URL.
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(cb, GetInstance()));
-}
-
 // static
 PluginFinder* PluginFinder::GetInstance() {
   // PluginFinder::GetInstance() is the only method that's allowed to call
   // Singleton<PluginFinder>::get().
   return Singleton<PluginFinder>::get();
 }
 
 PluginFinder::PluginFinder() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
@@ skipping 96 matching lines @@
   base::AutoLock lock(mutex_);
   std::map<std::string, PluginInstaller*>::const_iterator it =
       installers_.find(identifier);
   if (it != installers_.end())
     return it->second;
 
   return NULL;
 }
 #endif
 
-PluginMetadata* PluginFinder::FindPluginMetadataWithIdentifier(
+string16 PluginFinder::FindPluginNameWithIdentifier(
     const std::string& identifier) {
   base::AutoLock lock(mutex_);
   std::map<std::string, PluginMetadata*>::const_iterator it =
       identifier_plugin_.find(identifier);
+  string16 name;
   if (it != identifier_plugin_.end())
-    return it->second;
+    name = it->second->name();
 
-  return NULL;
+  return name.empty() ? UTF8ToUTF16(identifier) : name;
 }
 
 PluginMetadata* PluginFinder::CreatePluginMetadata(
     const std::string& identifier,
     const DictionaryValue* plugin_dict) {
   DCHECK(!identifier_plugin_[identifier]);
   std::string url;
   bool success = plugin_dict->GetString("url", &url);
   std::string help_url;
   plugin_dict->GetString("help_url", &help_url);
@@ skipping 59 matching lines @@
   std::string identifier = GetIdentifier(plugin);
   PluginMetadata* metadata = new PluginMetadata(identifier,
                                                 GetGroupName(plugin),
                                                 false, GURL(), GURL(),
                                                 GetGroupName(plugin));
 
   name_plugin_[plugin.name] = metadata;
   identifier_plugin_[identifier] = metadata;
   return metadata;
 }