Re-land r93365 - add RefCountedString

chrome/browser/favicon/favicon_handler_unittest.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/favicon/favicon_handler.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
@@ skipping 311 matching lines @@
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(history::FAVICON, history_handler->icon_type_);
 
   // Set valid icon data.
   history_handler->favicon_data_.known_icon = true;
   history_handler->favicon_data_.icon_type = history::FAVICON;
   history_handler->favicon_data_.expired = false;
   history_handler->favicon_data_.icon_url = icon_url;
   scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
-  FillBitmap(kFaviconSize, kFaviconSize, &data->data);
+  FillBitmap(kFaviconSize, kFaviconSize, &data->data());
   history_handler->favicon_data_.image_data = data;
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(icon_url, helper.GetEntry()->favicon().url());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
@@ skipping 92 matching lines @@
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(history::FAVICON, history_handler->icon_type_);
 
   // Set valid icon data.
   history_handler->favicon_data_.known_icon = true;
   history_handler->favicon_data_.icon_type = history::FAVICON;
   history_handler->favicon_data_.expired = false;
   history_handler->favicon_data_.icon_url = icon_url;
   scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
-  FillBitmap(kFaviconSize, kFaviconSize, &data->data);
+  FillBitmap(kFaviconSize, kFaviconSize, &data->data());
   history_handler->favicon_data_.image_data = data;
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(icon_url, helper.GetEntry()->favicon().url());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
@@ skipping 66 matching lines @@
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(history::FAVICON, history_handler->icon_type_);
 
   // Set valid icon data.
   history_handler->favicon_data_.known_icon = true;
   history_handler->favicon_data_.icon_type = history::FAVICON;
   history_handler->favicon_data_.expired = false;
   history_handler->favicon_data_.icon_url = icon_url;
   scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
-  FillBitmap(kFaviconSize, kFaviconSize, &data->data);
+  FillBitmap(kFaviconSize, kFaviconSize, &data->data());
   history_handler->favicon_data_.image_data = data;
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
   EXPECT_TRUE(helper.GetEntry()->favicon().is_valid());
   EXPECT_EQ(icon_url, helper.GetEntry()->favicon().url());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
@@ skipping 121 matching lines @@
 
   // Reset download handler
   helper.set_download_handler(NULL);
 
   // Smulates getting a expired icon from history.
   history_handler->favicon_data_.known_icon = true;
   history_handler->favicon_data_.icon_type = history::TOUCH_ICON;
   history_handler->favicon_data_.expired = true;
   history_handler->favicon_data_.icon_url = new_icon_url;
   scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
-  FillBitmap(kFaviconSize, kFaviconSize, &data->data);
+  FillBitmap(kFaviconSize, kFaviconSize, &data->data());
   history_handler->favicon_data_.image_data = data;
   history_handler->InvokeCallback();
 
   // Verify the download request.
   download_handler = helper.download_handler();
   EXPECT_TRUE(download_handler);
   EXPECT_EQ(new_icon_url, download_handler->image_url_);
   EXPECT_EQ(0, download_handler->image_size_);
 
   helper.set_history_handler(NULL);
@@ skipping 108 matching lines @@
 
   // Smulates getting the icon from history.
   scoped_ptr<HistoryRequestHandler> handler;
   handler.reset(new HistoryRequestHandler(page_url, latest_icon_url,
                                           history::TOUCH_ICON, callback));
   handler->favicon_data_.known_icon = true;
   handler->favicon_data_.expired = false;
   handler->favicon_data_.icon_type = history::TOUCH_ICON;
   handler->favicon_data_.icon_url = latest_icon_url;
   scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
-  FillBitmap(kFaviconSize, kFaviconSize, &data->data);
+  FillBitmap(kFaviconSize, kFaviconSize, &data->data());
   handler->favicon_data_.image_data = data;
 
   handler->InvokeCallback();
 
   // No download request.
   EXPECT_FALSE(helper.download_handler());
 }
 
 }  // namespace.