base::Bind() conversion for chrome/browser/search_engines

chrome/browser/search_engines/search_provider_install_data.cc

 // Copyright (c) 2011 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/search_engines/search_provider_install_data.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "base/task.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 108 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, ui_death_notification, ui_death_source);
 }
 
 void GoogleURLObserver::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_GOOGLE_URL_UPDATED) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-        NewRunnableMethod(change_notifier_.get(),
-                          &GoogleURLChangeNotifier::OnChange,
-                          UIThreadSearchTermsData().GoogleBaseURLValue()));
+        base::Bind(&GoogleURLChangeNotifier::OnChange,
+                   change_notifier_.get(),
+                   UIThreadSearchTermsData().GoogleBaseURLValue()));
   } else {
     // This must be the death notification.
     delete this;
   }
 }
 
 // Indicates if the two inputs have the same security origin.
 // |requested_origin| should only be a security origin (no path, etc.).
 // It is ok if |template_url| is NULL.
 static bool IsSameOrigin(const GURL& requested_origin,
@@ skipping 24 matching lines @@
 
 SearchProviderInstallData::~SearchProviderInstallData() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (load_handle_) {
     DCHECK(web_service_.get());
     web_service_->CancelRequest(load_handle_);
   }
 }
 
-void SearchProviderInstallData::CallWhenLoaded(Task* task) {
+void SearchProviderInstallData::CallWhenLoaded(const base::Closure& closure) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (provider_map_.get()) {
-    task->Run();
-    delete task;
+    closure.Run();
     return;
   }
 
-  task_queue_.Push(task);
+  closure_queue_.push_back(closure);
   if (load_handle_)
     return;
 
   if (web_service_.get())
     load_handle_ = web_service_->GetKeywords(this);
   else
     OnLoadFailed();
 }
 
 SearchProviderInstallData::State SearchProviderInstallData::GetInstallState(
@@ skipping 85 matching lines @@
   provider_map_.reset(new SearchHostToURLsMap());
   IOThreadSearchTermsData search_terms_data(google_base_url_);
   provider_map_->Init(template_urls_.get(), search_terms_data);
   SetDefault(NULL);
   NotifyLoaded();
 }
 
 void SearchProviderInstallData::NotifyLoaded() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  task_queue_.Run();
+  for (std::vector<base::Closure>::const_iterator it = closure_queue_.begin();
+       it != closure_queue_.end();
+       ++it) {
+    it->Run();
+  }
+  closure_queue_.clear();

[sky, 2011/11/16 04:42:17]

I've feel better if you created a vector on the stack, swapped the two, and used
the one on the stack for sending notification. Also, isn't there some for_each
magic that can streamline this?

[dcheng, 2011/11/16 10:00:39]

Done for both, but any particular reason for preferring swap()? I don't think
it's threadsafe either way without synchronization.

 
   // Since we expect this request to be rare, clear out the information. This
   // also keeps the responses current as the search providers change.
   provider_map_.reset();
   SetDefault(NULL);
 }