Re-land r93365 - add RefCountedString

chrome/browser/ui/webui/fileicon_source.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/fileicon_source.h"
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/utf_string_conversions.h"
@@ skipping 27 matching lines @@
 #elif defined(OS_POSIX)
   // The correct encoding on Linux may not actually be UTF8.
   FilePath escaped_filepath(escaped_path);
 #endif
 
   IconManager* im = g_browser_process->icon_manager();
   gfx::Image* icon = im->LookupIcon(escaped_filepath, IconLoader::NORMAL);
 
   if (icon) {
     scoped_refptr<RefCountedBytes> icon_data(new RefCountedBytes);
-    gfx::PNGCodec::EncodeBGRASkBitmap(*icon, false, &icon_data->data);
+    gfx::PNGCodec::EncodeBGRASkBitmap(*icon, false, &icon_data->data());
 
     SendResponse(request_id, icon_data);
   } else {
     // Icon was not in cache, go fetch it slowly.
     IconManager::Handle h = im->LoadIcon(escaped_filepath,
         IconLoader::NORMAL,
         &cancelable_consumer_,
         NewCallback(this, &FileIconSource::OnFileIconDataAvailable));
 
     // Attach the ChromeURLDataManager request ID to the history request.
     cancelable_consumer_.SetClientData(im, h, request_id);
   }
 }
 
 std::string FileIconSource::GetMimeType(const std::string&) const {
   // Rely on image decoder inferring the correct type.
   return std::string();
 }
 
 void FileIconSource::OnFileIconDataAvailable(IconManager::Handle handle,
                                              gfx::Image* icon) {
   IconManager* im = g_browser_process->icon_manager();
   int request_id = cancelable_consumer_.GetClientData(im, handle);
 
   if (icon) {
     scoped_refptr<RefCountedBytes> icon_data(new RefCountedBytes);
-    gfx::PNGCodec::EncodeBGRASkBitmap(*icon, false, &icon_data->data);
+    gfx::PNGCodec::EncodeBGRASkBitmap(*icon, false, &icon_data->data());
 
     SendResponse(request_id, icon_data);
   } else {
     // TODO(glen): send a dummy icon.
     SendResponse(request_id, NULL);
   }
 }