Allow favicons for synced bookmarks to expire

chrome/browser/sync/test/integration/bookmarks_helper.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/sync/test/integration/bookmarks_helper.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
+#include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
@@ skipping 236 matching lines @@
           node, profile, icon_url, image.As1xPNGBytes());
     }
 
     // Wait for the favicon for |node| to be invalidated.
     observer.WaitForSetFavicon();
     // Wait for the BookmarkModel to fetch the updated favicon and for the new
     // favicon to be sent to BookmarkChangeProcessor.
     GetFaviconData(model, node);
 }
 
+void ExpireFaviconImpl(Profile* profile, const BookmarkNode* node) {

[Nicolas Zea, 2015/05/14 04:08:23]

nit: comment for these two methods and what they're for 

[pkotwicz, 2015/05/14 14:54:36]

Done.

+  favicon::FaviconService* favicon_service =
+      FaviconServiceFactory::GetForProfile(profile,
+                                           ServiceAccessType::EXPLICIT_ACCESS);
+  favicon_service->SetFaviconOutOfDateForPage(node->url());
+}
+
+void OnGotFaviconForExpiryCheck(
+    const base::Closure& callback,
+    const favicon_base::FaviconRawBitmapResult& bitmap_result) {
+  ASSERT_TRUE(bitmap_result.is_valid());
+  ASSERT_TRUE(bitmap_result.expired);
+  callback.Run();
+}
+
 // Wait for all currently scheduled tasks on the history thread for all
 // profiles to complete and any notifications sent to the UI thread to have
 // finished processing.
 void WaitForHistoryToProcessPendingTasks() {
   // Skip waiting for history to complete for tests without favicons.
   if (!urls_with_favicons_)
     return;
 
   std::vector<Profile*> profiles_which_need_to_wait;
   if (sync_datatype_helper::test()->use_verifier())
@@ skipping 296 matching lines @@
                    image,
                    favicon_source);
   }
   SetFaviconImpl(sync_datatype_helper::test()->GetProfile(profile),
                  node,
                  icon_url,
                  image,
                  favicon_source);
 }
 
+void ExpireFavicon(int profile, const BookmarkNode* node) {
+  BookmarkModel* model = GetBookmarkModel(profile);
+  ASSERT_EQ(bookmarks::GetBookmarkNodeByID(model, node->id()), node)
+      << "Node " << node->GetTitle() << " does not belong to "
+      << "Profile " << profile;
+  ASSERT_EQ(BookmarkNode::URL, node->type()) << "Node " << node->GetTitle()
+                                             << " must be a url.";
+  ASSERT_EQ(1u, urls_with_favicons_->count(node->url()));
+
+  if (sync_datatype_helper::test()->use_verifier()) {
+    const BookmarkNode* v_node = nullptr;
+    FindNodeInVerifier(model, node, &v_node);
+    ExpireFaviconImpl(sync_datatype_helper::test()->verifier(), node);
+  }
+  ExpireFaviconImpl(sync_datatype_helper::test()->GetProfile(profile), node);
+
+  WaitForHistoryToProcessPendingTasks();
+}
+
+void CheckFaviconExpired(int profile, const GURL& icon_url) {
+  base::RunLoop run_loop;
+
+  favicon::FaviconService* favicon_service =
+      FaviconServiceFactory::GetForProfile(
+          sync_datatype_helper::test()->GetProfile(profile),
+          ServiceAccessType::EXPLICIT_ACCESS);
+  base::CancelableTaskTracker task_tracker;
+  favicon_service->GetRawFavicon(
+      icon_url, favicon_base::FAVICON, 0,
+      base::Bind(&OnGotFaviconForExpiryCheck, run_loop.QuitClosure()),
+      &task_tracker);
+
+  run_loop.Run();
+}
+
 const BookmarkNode* SetURL(int profile,
                            const BookmarkNode* node,
                            const GURL& new_url) {
   BookmarkModel* model = GetBookmarkModel(profile);
   if (bookmarks::GetBookmarkNodeByID(model, node->id()) != node) {
     LOG(ERROR) << "Node " << node->GetTitle() << " does not belong to "
                << "Profile " << profile;
     return NULL;
   }
   if (sync_datatype_helper::test()->use_verifier()) {
@@ skipping 259 matching lines @@
 
 std::string IndexedSubfolderName(int i) {
   return base::StringPrintf("Subfolder Name %d", i);
 }
 
 std::string IndexedSubsubfolderName(int i) {
   return base::StringPrintf("Subsubfolder Name %d", i);
 }
 
 }  // namespace bookmarks_helper