Re-land r93365 - add RefCountedString

chrome/browser/ui/webui/options/options_ui.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/options/options_ui.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 97 matching lines @@
     : DataSource(chrome::kChromeUISettingsHost, MessageLoop::current()) {
   DCHECK(localized_strings);
   localized_strings_.reset(localized_strings);
 }
 
 OptionsUIHTMLSource::~OptionsUIHTMLSource() {}
 
 void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
                                            bool is_incognito,
                                            int request_id) {
-  scoped_refptr<RefCountedBytes> response_bytes(new RefCountedBytes);
+  std::string response;
   SetFontAndTextDirection(localized_strings_.get());
 
   if (path == kLocalizedStringsFile) {
     // Return dynamically-generated strings from memory.
-    std::string template_data;
-    jstemplate_builder::AppendJsonJS(localized_strings_.get(), &template_data);
-    response_bytes->data.resize(template_data.size());
-    std::copy(template_data.begin(),
-              template_data.end(),
-              response_bytes->data.begin());
+    jstemplate_builder::AppendJsonJS(localized_strings_.get(), &response);
   } else if (path == kOptionsBundleJsFile) {
     // Return (and cache) the options javascript code.
-    static const base::StringPiece options_javascript(
-        ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_OPTIONS_BUNDLE_JS));
-    response_bytes->data.resize(options_javascript.size());
-    std::copy(options_javascript.begin(),
-              options_javascript.end(),
-              response_bytes->data.begin());
+    ResourceBundle::GetSharedInstance().GetRawDataResource(
+        IDR_OPTIONS_BUNDLE_JS).CopyToString(&response);
   } else {
     // Return (and cache) the main options html page as the default.
-    static const base::StringPiece options_html(
-        ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_OPTIONS_HTML));
-    response_bytes->data.resize(options_html.size());
-    std::copy(options_html.begin(),
-              options_html.end(),
-              response_bytes->data.begin());
+    ResourceBundle::GetSharedInstance().GetRawDataResource(
+        IDR_OPTIONS_HTML).CopyToString(&response);

[Elliot Glaysher, 2011/07/19 17:59:02]

Both versions here are wrong.

Data that comes from the ResourceBundle should be put directly into
RefCountedStaticMemory through ResourceBundle::LoadDataResourceBytes. This is
the reason I made the RefCountedMemory system in the first place.

The idea is that memory that has been mmapped shouldn't be copied at all and
isn't owned by anyone.

   }
 
-  SendResponse(request_id, response_bytes);
+  SendResponse(request_id, base::RefCountedString::TakeString(&response));
 }
 
 std::string OptionsUIHTMLSource::GetMimeType(const std::string& path) const {
   if (path == kLocalizedStringsFile || path == kOptionsBundleJsFile)
     return "application/javascript";
 
   return "text/html";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 190 matching lines @@
                                         OptionsPageUIHandler* handler_raw) {
   scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
   DCHECK(handler.get());
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
     handler->GetLocalizedValues(localized_strings);
     // Add handler to the list and also pass the ownership.
     AddMessageHandler(handler.release()->Attach(this));
   }
 }