Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/sync/glue/favicon_cache_unittest.cc

 // Copyright (c) 2013 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/sync/glue/favicon_cache.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
@@ skipping 393 matching lines @@
 }
 
 scoped_ptr<syncer::SyncErrorFactory> SyncFaviconCacheTest::
     CreateAndPassSyncErrorFactory() {
   return scoped_ptr<syncer::SyncErrorFactory>(
       new syncer::SyncErrorFactoryMock());
 }
 
 void SyncFaviconCacheTest::OnCustomFaviconDataAvailable(
     const TestFaviconData& test_data) {
-  std::vector<favicon_base::FaviconBitmapResult> bitmap_results;
+  std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
   if (!test_data.image_16.empty()) {
-    favicon_base::FaviconBitmapResult bitmap_result;
+    favicon_base::FaviconRawBitmapResult bitmap_result;
     bitmap_result.icon_url = test_data.icon_url;
     bitmap_result.pixel_size.set_width(16);
     bitmap_result.pixel_size.set_height(16);
     base::RefCountedString* temp_string = new base::RefCountedString();
     temp_string->data() = test_data.image_16;
     bitmap_result.bitmap_data = temp_string;
     bitmap_results.push_back(bitmap_result);
   }
   if (!test_data.image_32.empty()) {
-    favicon_base::FaviconBitmapResult bitmap_result;
+    favicon_base::FaviconRawBitmapResult bitmap_result;
     bitmap_result.icon_url = test_data.icon_url;
     bitmap_result.pixel_size.set_width(32);
     bitmap_result.pixel_size.set_height(32);
     base::RefCountedString* temp_string = new base::RefCountedString();
     temp_string->data() = test_data.image_32;
     bitmap_result.bitmap_data = temp_string;
     bitmap_results.push_back(bitmap_result);
   }
   if (!test_data.image_64.empty()) {
-    favicon_base::FaviconBitmapResult bitmap_result;
+    favicon_base::FaviconRawBitmapResult bitmap_result;
     bitmap_result.icon_url = test_data.icon_url;
     bitmap_result.pixel_size.set_width(64);
     bitmap_result.pixel_size.set_height(64);
     base::RefCountedString* temp_string = new base::RefCountedString();
     temp_string->data() = test_data.image_64;
     bitmap_result.bitmap_data = temp_string;
     bitmap_results.push_back(bitmap_result);
   }
   cache()->OnFaviconDataAvailable(test_data.page_url, bitmap_results);
 }
@@ skipping 1485 matching lines @@
   EXPECT_EQ(changes[4].change_type(), syncer::SyncChange::ACTION_ADD);
   EXPECT_EQ(changes[4].sync_data().GetDataType(), syncer::FAVICON_TRACKING);
   EXPECT_EQ(kMaxSyncFavicons, GetFaviconId(changes[4]));
   // Expire tracking for favicon[0].
   EXPECT_EQ(changes[5].change_type(), syncer::SyncChange::ACTION_DELETE);
   EXPECT_EQ(changes[5].sync_data().GetDataType(), syncer::FAVICON_TRACKING);
   EXPECT_EQ(0, GetFaviconId(changes[5]));
 }
 
 }  // namespace browser_sync