Re-land r93365 - add RefCountedString

chrome/browser/history/top_sites_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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
@@ skipping 90 matching lines @@
   int number_of_callbacks_;
   bool waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSitesQuerier);
 };
 
 // Extracts the data from |t1| into a SkBitmap. This is intended for usage of
 // thumbnail data, which is stored as jpgs.
 SkBitmap ExtractThumbnail(const RefCountedBytes& t1) {
   scoped_ptr<SkBitmap> image(gfx::JPEGCodec::Decode(t1.front(),
-                                                    t1.data.size()));
+                                                    t1.size()));
   return image.get() ? *image : SkBitmap();
 }
 
 // Returns true if t1 and t2 contain the same data.
 bool ThumbnailsAreEqual(RefCountedBytes* t1, RefCountedBytes* t2) {
   if (!t1 || !t2)
     return false;
-  if (t1->data.size() != t2->data.size())
+  if (t1->size() != t2->size())
     return false;
-  return std::equal(t1->data.begin(),
-                    t1->data.end(),
-                    t2->data.begin());
+  return std::equal(t1->data()->begin(),
+                    t1->data()->end(),
+                    t2->data()->begin());
 }
 
 }  // namespace
 
 class TopSitesTest : public HistoryUnitTestBase {
  public:
   TopSitesTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB, &message_loop_),
         original_command_line_(*CommandLine::ForCurrentProcess()) {
@@ skipping 1200 matching lines @@
   WaitForTopSites();
   EXPECT_FALSE(IsTopSitesLoaded());
 
   // Load history, which should make TopSites finish loading too.
   profile()->CreateHistoryService(false, false);
   profile()->BlockUntilTopSitesLoaded();
   EXPECT_TRUE(IsTopSitesLoaded());
 }
 
 }  // namespace history