Re-land r93365 - add RefCountedString

chrome/browser/ui/webui/ntp/ntp_resource_cache.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/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 151 matching lines @@
 
   // Watch for pref changes that cause us to need to invalidate the HTML cache.
   pref_change_registrar_.Init(profile_->GetPrefs());
   pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
   pref_change_registrar_.Add(prefs::kEnableBookmarkBar, this);
   pref_change_registrar_.Add(prefs::kNTPShownSections, this);
 }
 
 NTPResourceCache::~NTPResourceCache() {}
 
-RefCountedBytes* NTPResourceCache::GetNewTabHTML(bool is_incognito) {
+RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (is_incognito) {
     if (!new_tab_incognito_html_.get())
       CreateNewTabIncognitoHTML();
   } else {
     if (!new_tab_html_.get())
       CreateNewTabHTML();
   }
   return is_incognito ? new_tab_incognito_html_.get()
                       : new_tab_html_.get();
 }
 
-RefCountedBytes* NTPResourceCache::GetNewTabCSS(bool is_incognito) {
+RefCountedMemory* NTPResourceCache::GetNewTabCSS(bool is_incognito) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (is_incognito) {
     if (!new_tab_incognito_css_.get())
       CreateNewTabIncognitoCSS();
   } else {
     if (!new_tab_css_.get())
       CreateNewTabCSS();
   }
   return is_incognito ? new_tab_incognito_css_.get()
                       : new_tab_css_.get();
@@ skipping 53 matching lines @@
 
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
 
   static const base::StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           new_tab_html_idr));
 
   std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
       incognito_tab_html, &localized_strings);
 
-  new_tab_incognito_html_ = new RefCountedBytes;
-  new_tab_incognito_html_->data.resize(full_html.size());
-  std::copy(full_html.begin(), full_html.end(),
-            new_tab_incognito_html_->data.begin());
+  new_tab_incognito_html_ = base::RefCountedString::TakeString(&full_html);
 }
 
 void NTPResourceCache::CreateNewTabHTML() {
   // TODO(estade): these strings should be defined in their relevant handlers
   // (in GetLocalizedValues) and should have more legible names.
   // Show the profile name in the title and most visited labels if the current
   // profile is not the default.
   string16 apps = l10n_util::GetStringUTF16(IDS_NEW_TAB_APPS);
   string16 title = l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE);
   string16 most_visited = l10n_util::GetStringUTF16(IDS_NEW_TAB_MOST_VISITED);
@@ skipping 152 matching lines @@
       full_html.append(json_html);
       size_t after_offset = pos + template_data_placeholder.size();
       full_html.append(new_tab_html.data() + after_offset,
                        new_tab_html.size() - after_offset);
     } else {
       NOTREACHED();
       full_html.assign(new_tab_html.data(), new_tab_html.size());
     }
   }
 
-  new_tab_html_ = new RefCountedBytes;
-  new_tab_html_->data.resize(full_html.size());
-  std::copy(full_html.begin(), full_html.end(), new_tab_html_->data.begin());
+  new_tab_html_ = base::RefCountedString::TakeString(&full_html);
 }
 
 void NTPResourceCache::CreateNewTabIncognitoCSS() {
   ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
   DCHECK(tp);
 
   // Get our theme colors
   SkColor color_background =
       tp->GetColor(ThemeService::COLOR_NTP_BACKGROUND);
 
@@ skipping 12 matching lines @@
 
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_NEW_INCOGNITO_TAB_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string full_css = ReplaceStringPlaceholders(
       new_tab_theme_css, subst, NULL);
 
-  new_tab_incognito_css_ = new RefCountedBytes;
-  new_tab_incognito_css_->data.resize(full_css.size());
-  std::copy(full_css.begin(), full_css.end(),
-            new_tab_incognito_css_->data.begin());
+  new_tab_incognito_css_ = base::RefCountedString::TakeString(&full_css);
 }
 
 void NTPResourceCache::CreateNewTabCSS() {
   ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
   DCHECK(tp);
 
   // Get our theme colors
   SkColor color_background =
       tp->GetColor(ThemeService::COLOR_NTP_BACKGROUND);
   SkColor color_text = tp->GetColor(ThemeService::COLOR_NTP_TEXT);
@@ skipping 74 matching lines @@
   int ntp_css_resource_id =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4) ?
           IDR_NEW_TAB_4_THEME_CSS : IDR_NEW_TAB_THEME_CSS;
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           ntp_css_resource_id));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
-  new_tab_css_ = new RefCountedBytes;
-  new_tab_css_->data.resize(css_string.size());
-  std::copy(css_string.begin(), css_string.end(),
-            new_tab_css_->data.begin());
+  new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }