Sync the bookmark's icon URL

chrome/browser/sync/test/integration/bookmarks_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 70 matching lines @@
     const BookmarkNode* parent,
     int index,
     const std::wstring& title) WARN_UNUSED_RESULT;
 
 // Changes the title of the node |node| in the bookmark model of profile
 // |profile| to |new_title|.
 void SetTitle(int profile,
                      const BookmarkNode* node,
                      const std::wstring& new_title);
 
-// Sets the favicon of the node |node| (of type BookmarkNode::URL) in the
-// bookmark model of profile |profile| using the data in |icon_bytes_vector|.
-void SetFavicon(
-    int profile,
-    const BookmarkNode* node,
-    const std::vector<unsigned char>& icon_bytes_vector);
+// Sets the |icon_url| and |image| data of the favicon of the node |node|
+// (of type BookmarkNode::URL) in the bookmark model of profile |profile|.

[Nicolas Zea, 2012/11/27 18:56:09]

move "(of type BookmarkNode::URL) to right after |icon_url|, which it refers to.

+void SetFavicon(int profile,
+                const BookmarkNode* node,
+                const GURL& icon_url,
+                const gfx::Image& image);
 
 // Changes the url of the node |node| in the bookmark model of profile
 // |profile| to |new_url|. Returns a pointer to the node with the changed url.
 const BookmarkNode* SetURL(
     int profile,
     const BookmarkNode* node,
     const GURL& new_url) WARN_UNUSED_RESULT;
 
 // Moves the node |node| in the bookmark model of profile |profile| so it ends
 // up under the node |new_parent| at position |index|.
@@ skipping 51 matching lines @@
 int CountBookmarksWithTitlesMatching(
     int profile,
     const std::wstring& title) WARN_UNUSED_RESULT;
 
 // Returns the number of bookmark folders in the bookmark model of profile
 // |profile| whose titles contain the query string |title|.
 int CountFoldersWithTitlesMatching(
     int profile,
     const std::wstring& title) WARN_UNUSED_RESULT;
 
-// Creates a unique favicon using |seed|.
-std::vector<unsigned char> CreateFavicon(int seed);
+// Creates a favicon of |color| with image reps of the platform's supported
+// scale factors (eg MacOS) in addition to 1x.
+gfx::Image CreateFavicon(SkColor color);
 
 // Returns a URL identifiable by |i|.
 std::string IndexedURL(int i);
 
 // Returns a URL title identifiable by |i|.
 std::wstring IndexedURLTitle(int i);
 
 // Returns a folder name identifiable by |i|.
 std::wstring IndexedFolderName(int i);
 
 // Returns a subfolder name identifiable by |i|.
 std::wstring IndexedSubfolderName(int i);
 
 // Returns a subsubfolder name identifiable by |i|.
 std::wstring IndexedSubsubfolderName(int i);
 
 }  // namespace bookmarks_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_