Re-land r93365 - add RefCountedString

chrome/browser/history/history_backend.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/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 1493 matching lines @@
 
     history::RedirectList redirects;
     URLID url_id;
     bool success = false;
 
     // If there are some redirects, try to get a thumbnail from the last
     // redirect destination.
     if (GetMostRecentRedirectsFrom(page_url, &redirects) &&
         !redirects.empty()) {
       if ((url_id = db_->GetRowForURL(redirects.back(), NULL)))
-        success = thumbnail_db_->GetPageThumbnail(url_id, &(*data)->data);
+        success = thumbnail_db_->GetPageThumbnail(url_id, &(*data)->data());
     }
 
     // If we don't have a thumbnail from redirects, try the URL directly.
     if (!success) {
       if ((url_id = db_->GetRowForURL(page_url, NULL)))
-        success = thumbnail_db_->GetPageThumbnail(url_id, &(*data)->data);
+        success = thumbnail_db_->GetPageThumbnail(url_id, &(*data)->data());
     }
 
     // In this rare case, we start to mine the older redirect sessions
     // from the visit table to try to find a thumbnail.
     if (!success) {
-      success = GetThumbnailFromOlderRedirect(page_url, &(*data)->data);
+      success = GetThumbnailFromOlderRedirect(page_url, &(*data)->data());
     }
 
     if (!success)
       *data = NULL;  // This will tell the callback there was an error.
 
     UMA_HISTOGRAM_TIMES("History.GetPageThumbnail",
                         TimeTicks::Now() - beginning_time);
   }
 }
 
@@ skipping 149 matching lines @@
   FaviconData favicon;
 
   if (thumbnail_db_.get()) {
     const FaviconID favicon_id =
         thumbnail_db_->GetFaviconIDForFaviconURL(
             icon_url, icon_types, &favicon.icon_type);
     if (favicon_id) {
       scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
       favicon.known_icon = true;
       Time last_updated;
-      if (thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data->data,
+      if (thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data->data(),
                                     NULL)) {
         favicon.expired = (Time::Now() - last_updated) >
             TimeDelta::FromDays(kFaviconRefetchDays);
         favicon.image_data = data;
       }
 
       if (page_url)
         SetFaviconMapping(*page_url, favicon_id, favicon.icon_type);
     }
     // else case, haven't cached entry yet. Caller is responsible for
@@ skipping 15 matching lines @@
   if (db_.get() && thumbnail_db_.get()) {
     // Time the query.
     TimeTicks beginning_time = TimeTicks::Now();
 
     std::vector<IconMapping> icon_mappings;
     Time last_updated;
     scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
     if (thumbnail_db_->GetIconMappingsForPageURL(page_url, &icon_mappings) &&
         (icon_mappings.front().icon_type & icon_types) &&
         thumbnail_db_->GetFavicon(icon_mappings.front().icon_id, &last_updated,
-                                  &data->data, &favicon.icon_url)) {
+                                  &data->data(), &favicon.icon_url)) {
       favicon.known_icon = true;
       favicon.expired = (Time::Now() - last_updated) >
           TimeDelta::FromDays(kFaviconRefetchDays);
       favicon.icon_type = icon_mappings.front().icon_type;
       favicon.image_data = data;
     }
 
     UMA_HISTOGRAM_TIMES("History.GetFavIconForURL",  // historical name
                         TimeTicks::Now() - beginning_time);
   }
@@ skipping 486 matching lines @@
   return true;
 }
 
 BookmarkService* HistoryBackend::GetBookmarkService() {
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history