base::Bind: Complete cleanup of history/.
Previous version reverted; linux touch build now fixed.
TBR=csilv
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8205024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104660 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 8952d65..c6065ac 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/bookmarks/bookmark_html_writer.h"
#include "base/base64.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
#include "base/callback.h"
#include "base/file_path.h"
#include "base/memory/scoped_ptr.h"
@@ -448,7 +450,8 @@
profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
favicon_service->GetFaviconForURL(GURL(url), history::FAVICON,
&favicon_consumer_,
- NewCallback(this, &BookmarkFaviconFetcher::OnFaviconDataAvailable));
+ base::Bind(&BookmarkFaviconFetcher::OnFaviconDataAvailable,
+ base::Unretained(this)));
return true;
} else {
bookmark_urls_.pop_front();
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 18bb942..b9db127 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -7,7 +7,8 @@
#include <algorithm>
#include <functional>
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/memory/scoped_vector.h"
#include "build/build_config.h"
@@ -749,7 +750,8 @@
return;
FaviconService::Handle handle = favicon_service->GetFaviconForURL(
node->url(), history::FAVICON, &load_consumer_,
- NewCallback(this, &BookmarkModel::OnFaviconDataAvailable));
+ base::Bind(&BookmarkModel::OnFaviconDataAvailable,
+ base::Unretained(this)));
load_consumer_.SetClientData(favicon_service, handle, node);
node->set_favicon_load_handle(handle);
}
