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

chrome/test/live_sync/bookmark_model_verifier.h

 // 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.
 
 #ifndef CHROME_TEST_LIVE_SYNC_BOOKMARK_MODEL_VERIFIER_H_
 #define CHROME_TEST_LIVE_SYNC_BOOKMARK_MODEL_VERIFIER_H_
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/profile.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class BookmarkModel;
 class BookmarkNode;
 
 // Helper class that performs operations on a bookmark model and echoes the
 // changes in a verifier model that can be used as an expected hierarchy to
 // compare against.
 // Note: When we refer to the "same" node in |model| and |verifier_model_|,
 // we mean the same canonical bookmark entity, because |verifier_model_| is
 // expected to be a replica of |model|.
 class BookmarkModelVerifier {
  public:
   explicit BookmarkModelVerifier(BookmarkModel* model)
       : verifier_model_(model),
         use_verifier_model_(true) {}
 
   ~BookmarkModelVerifier() {}
 
   // Checks if the hierarchies in |model_a| and |model_b| are equivalent in
-  // terms of the data model. Compares favicons if |compare_favicons| is true.
-  // Returns true if they match.
+  // terms of the data model and favicon. Returns true if they both match.
   // Note: Some peripheral fields like creation times are allowed to mismatch.
   static bool ModelsMatch(BookmarkModel* model_a,
-                          BookmarkModel* model_b,
-                          bool compare_favicons) WARN_UNUSED_RESULT;
-
-  // Same as the above method, but does not check if the favicons match.
-  static bool ModelsMatch(BookmarkModel* model_a,
-                          BookmarkModel* model_b) WARN_UNUSED_RESULT {
-    return ModelsMatch(model_a, model_b, false);
-  }
+                          BookmarkModel* model_b) WARN_UNUSED_RESULT;
 
   // Checks if |model| contains any instances of two bookmarks with the same URL
   // under the same parent folder. Returns true if even one instance is found.
   static bool ContainsDuplicateBookmarks(BookmarkModel* model);
 
   // Checks if the favicon data in |bitmap_a| and |bitmap_b| are equivalent.
   // Returns true if they match.
   static bool FaviconsMatch(const SkBitmap& bitmap_a, const SkBitmap& bitmap_b);
 
   // Adds the same bookmark to |model| and |verifier_model_|. See
@@ skipping 10 matching lines @@
                                const BookmarkNode* parent,
                                int index,
                                const string16& title);
 
   // Sets the title of the same node in |model| and |verifier_model_|. See
   // BookmarkModel::SetTitle for details.
   void SetTitle(BookmarkModel* model,
                 const BookmarkNode* node,
                 const string16& title);
 
+  // Sets the favicon of the same node in |model| and |verifier_model_| using
+  // the data in |icon_bytes_vector|.
+  // See BookmarkChangeProcessor::ApplyBookmarkFavicon for details.
+  void SetFavicon(BookmarkModel* model,
+                  const BookmarkNode* node,
+                  const std::vector<unsigned char>& icon_bytes_vector);
+
   // Moves the same node to the same position in both |model| and
   // |verifier_model_|. See BookmarkModel::Move for details.
   void Move(BookmarkModel* model,
             const BookmarkNode* node,
             const BookmarkNode* new_parent,
             int index);
 
   // Removes the same node from |model| and |verifier_model_|. See
   // BookmarkModel::Remove for details.
   void Remove(BookmarkModel* model, const BookmarkNode* parent, int index);
@@ skipping 32 matching lines @@
   BookmarkModel* verifier_model_;
 
   // A flag that indicates whether bookmark operations should also update the
   // verifier model or not.
   bool use_verifier_model_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelVerifier);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_BOOKMARK_MODEL_VERIFIER_H_