Change so that the extension favicon is read on the UI thread since extension objects should only be accessed on the UI thread.

This also fixes erg's todo to make favicons use RefCountedMemory instead of RefCountedBytes in all places.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/1028001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41869 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 40326c5..40651ce 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -246,10 +246,10 @@ class Writer : public Task {
       BookmarkFaviconFetcher::URLFaviconMap::iterator itr =
           favicons_map_->find(url_string);
       if (itr != favicons_map_->end()) {
-        scoped_refptr<RefCountedBytes> data = itr->second.get();
+        scoped_refptr<RefCountedMemory> data = itr->second.get();
         std::string favicon_data;
-        favicon_data.assign(reinterpret_cast<char*>(&data->data.front()),
-                            data->data.size());
+        favicon_data.assign(reinterpret_cast<const char*>(data->front()),
+                            data->size());
         std::string favicon_base64_encoded;
         if (base::Base64Encode(favicon_data, &favicon_base64_encoded)) {
           GURL favicon_url("data:image/png;base64," + favicon_base64_encoded);
@@ -450,7 +450,7 @@ bool BookmarkFaviconFetcher::FetchNextFavicon() {
 void BookmarkFaviconFetcher::OnFavIconDataAvailable(
     FaviconService::Handle handle,
     bool know_favicon,
-    scoped_refptr<RefCountedBytes> data,
+    scoped_refptr<RefCountedMemory> data,
     bool expired,
     GURL icon_url) {
   GURL url;
@@ -458,7 +458,7 @@ void BookmarkFaviconFetcher::OnFavIconDataAvailable(
     url = GURL(bookmark_urls_.front());
     bookmark_urls_.pop_front();
   }
-  if (know_favicon && data.get() && !data->data.empty() && !url.is_empty()) {
+  if (know_favicon && data.get() && data->size() && !url.is_empty()) {
     favicons_map_->insert(make_pair(url.spec(), data));
   }
 
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h
index 0eba67f..58da351 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -38,7 +38,7 @@ class BookmarksExportObserver {
 class BookmarkFaviconFetcher: public NotificationObserver {
  public:
   // Map of URL and corresponding favicons.
-  typedef std::map<std::string, scoped_refptr<RefCountedBytes> > URLFaviconMap;
+  typedef std::map<std::string, scoped_refptr<RefCountedMemory> > URLFaviconMap;
 
   BookmarkFaviconFetcher(Profile* profile,
                          const FilePath& path,
@@ -69,7 +69,7 @@ class BookmarkFaviconFetcher: public NotificationObserver {
   // html output on the file thread.
   void OnFavIconDataAvailable(FaviconService::Handle handle,
                               bool know_favicon,
-                              scoped_refptr<RefCountedBytes> data,
+                              scoped_refptr<RefCountedMemory> data,
                               bool expired,
                               GURL icon_url);
 
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 73fc5ea..96da421 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -765,7 +765,7 @@ BookmarkNode* BookmarkModel::CreateRootNodeFromStarredEntry(
 void BookmarkModel::OnFavIconDataAvailable(
     FaviconService::Handle handle,
     bool know_favicon,
-    scoped_refptr<RefCountedBytes> data,
+    scoped_refptr<RefCountedMemory> data,
     bool expired,
     GURL icon_url) {
   SkBitmap fav_icon;
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 391792f..6e238bc 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -429,7 +429,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
   void OnFavIconDataAvailable(
       FaviconService::Handle handle,
       bool know_favicon,
-      scoped_refptr<RefCountedBytes> data,
+      scoped_refptr<RefCountedMemory> data,
       bool expired,
       GURL icon_url);