Fix the failed case AndroidProviderBackendTest.UpdateFavicon on Android

chrome/browser/history/android/android_provider_backend_unittest.cc

 // Copyright (c) 2012 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/history/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 1121 matching lines @@
 
   int update_count;
   std::vector<string16> update_args;
   // Update the last visit time to a value greater than current one.
   HistoryAndBookmarkRow update_row1;
 
   // Set favicon.
   std::vector<unsigned char> data;
   data.push_back('1');
   update_row1.set_favicon(base::RefCountedBytes::TakeVector(&data));
+  // the content of data is swapped, so reset it to compare with
+  // the result of GetFavicon
+  data.push_back('1');

[pkotwicz, 2012/08/20 14:17:29]

You can actually use new RefCountedBytes(data) instead.

   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   ASSERT_TRUE(delegate_.favicon_details());
   ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
@@ skipping 599 matching lines @@
   // Query by folder=1, the row2 should returned.
   statement.reset(backend->QueryHistoryAndBookmarks(
       projections, std::string("folder=1"), std::vector<string16>(),
       std::string("url ASC")));
   ASSERT_TRUE(statement->statement()->Step());
   EXPECT_EQ(row2.url(), GURL(statement->statement()->ColumnString(0)));
   EXPECT_FALSE(statement->statement()->Step());
 }
 
 }  // namespace history