Revert 162252 - Make Web Intents picker in Views conform to latest mocks

chrome/browser/ui/intents/web_intent_picker_controller.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/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 535 matching lines @@
       extension_id,
       &services);
 
   // Extension must be registered with registry by now.
   DCHECK(services.size() > 0);
 
   // TODO(binji): We're going to need to disambiguate if there are multiple
   // services. For now, just choose the first.
   const webkit_glue::WebIntentServiceData& service_data = services[0];
 
-  picker_model_->RemoveSuggestedExtension(extension_id);
-  AddServiceToModel(service_data);
+  picker_model_->AddInstalledService(
+      service_data.title, service_data.service_url,
+      service_data.disposition);
   OnServiceChosen(service_data.service_url, service_data.disposition,
                   kEnableDefaults);
   AsyncOperationFinished();
 }
 
 void WebIntentPickerController::OnExtensionInstallFailure(
     const std::string& id,
     const std::string& error,
     WebstoreInstaller::FailureReason reason) {
   // If the user cancelled the install then don't show an error message.
@@ skipping 520 matching lines @@
   content::DownloadManager* download_manager =
       content::BrowserContext::GetDownloadManager(profile);
   if (!download_manager)
     return;
   content::DownloadItem* item =
       download_manager->GetDownload(download_id_.local());
   if (item)
     item->Cancel(true);
   download_id_ = content::DownloadId();
 }