Merge 65840 - Provide sync integration tests with a way to set a favicon for ...

chrome/browser/sync/glue/bookmark_change_processor.cc

 // Copyright (c) 2010 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/bookmark_change_processor.h"
 
 #include <stack>
 #include <vector>
 
 #include "base/string16.h"
@@ skipping 41 matching lines @@
   // Set the properties of the item.
   dst->SetIsFolder(src->is_folder());
   dst->SetTitle(UTF16ToWideHack(src->GetTitle()));
   if (!src->is_folder())
     dst->SetURL(src->GetURL());
   SetSyncNodeFavicon(src, model, dst);
 }
 
 // static
 void BookmarkChangeProcessor::EncodeFavicon(const BookmarkNode* src,
-                                              BookmarkModel* model,
-                                              std::vector<unsigned char>* dst) {
+                                            BookmarkModel* model,
+                                            std::vector<unsigned char>* dst) {
   const SkBitmap& favicon = model->GetFavIcon(src);
 
   dst->clear();
 
   // Check for zero-dimension images.  This can happen if the favicon is
   // still being loaded.
   if (favicon.empty())
     return;
 
   // Re-encode the BookmarkNode's favicon as a PNG, and pass the data to the
@@ skipping 427 matching lines @@
 // Sets the favicon of the given bookmark node from the given sync node.
 bool BookmarkChangeProcessor::SetBookmarkFavicon(
     sync_api::BaseNode* sync_node,
     const BookmarkNode* bookmark_node,
     Profile* profile) {
   std::vector<unsigned char> icon_bytes_vector;
   sync_node->GetFaviconBytes(&icon_bytes_vector);
   if (icon_bytes_vector.empty())
     return false;
 
+  ApplyBookmarkFavicon(bookmark_node, profile, icon_bytes_vector);
+
+  return true;
+}
+
+// static
+// Applies the given favicon bytes vector to the given bookmark node.
+void BookmarkChangeProcessor::ApplyBookmarkFavicon(
+    const BookmarkNode* bookmark_node,
+    Profile* profile,
+    const std::vector<unsigned char>& icon_bytes_vector) {
   // Registering a favicon requires that we provide a source URL, but we
   // don't know where these came from.  Currently we just use the
   // destination URL, which is not correct, but since the favicon URL
   // is used as a key in the history's thumbnail DB, this gives us a value
   // which does not collide with others.
   GURL fake_icon_url = bookmark_node->GetURL();
 
   HistoryService* history =
       profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
   FaviconService* favicon_service =
       profile->GetFaviconService(Profile::EXPLICIT_ACCESS);
 
   history->AddPage(bookmark_node->GetURL(), history::SOURCE_SYNCED);
   favicon_service->SetFavicon(bookmark_node->GetURL(),
                               fake_icon_url,
                               icon_bytes_vector);
-
-  return true;
 }
 
 // static
 void BookmarkChangeProcessor::SetSyncNodeFavicon(
     const BookmarkNode* bookmark_node,
     BookmarkModel* model,
     sync_api::WriteNode* sync_node) {
   std::vector<unsigned char> favicon_bytes;
   EncodeFavicon(bookmark_node, model, &favicon_bytes);
   if (!favicon_bytes.empty())
     sync_node->SetFaviconBytes(favicon_bytes);
 }
 
 }  // namespace browser_sync