[Sync] Fix favicon updates to handle orphan nodes

chrome/browser/sync/glue/favicon_cache.h

Index: chrome/browser/sync/glue/favicon_cache.h
diff --git a/chrome/browser/sync/glue/favicon_cache.h b/chrome/browser/sync/glue/favicon_cache.h
index eaa44ae994e3f068ab8af7c9da806ae490dacafe..55657918354d674353d34d28f6f9bb67d25e7b66 100644
--- a/chrome/browser/sync/glue/favicon_cache.h
+++ b/chrome/browser/sync/glue/favicon_cache.h
@@ -134,13 +134,6 @@ class FaviconCache : public syncer::SyncableService,
   // Map of page url to favicon url.
   typedef std::map<GURL, GURL> PageFaviconMap;
 
-  // Enum used to decide which sync datatypes to update on a favicon change.
-  enum SyncState {
-    SYNC_IMAGE,
-    SYNC_TRACKING,
-    SYNC_BOTH
-  };
-
   // Helper method to perform OnReceivedSyncFavicon work without worrying about
   // whether caller holds a sync transaction.
   void OnReceivedSyncFaviconImpl(const GURL& icon_url,
@@ -153,12 +146,14 @@ class FaviconCache : public syncer::SyncableService,
       const GURL& page_url,
       const std::vector<history::FaviconBitmapResult>& bitmap_result);
 
-  // Helper method to update the sync state of the favicon at |icon_url|.
+  // Helper method to update the sync state of the favicon at |icon_url|. If
+  // either |image_change_type| or |tracking_change_type| is ACITON_INVALID,

[rlarocque, 2013/04/04 23:29:07]

typo: ACTION_INVALID.

[Nicolas Zea, 2013/04/04 23:42:29]

Done.

+  // the corresponding datatype won't be updated.
   // Note: should only be called after both FAVICON_IMAGES and FAVICON_TRACKING
   // have been successfully set up.
   void UpdateSyncState(const GURL& icon_url,
-                       SyncState state_to_update,
-                       syncer::SyncChange::SyncChangeType change_type);
+                       syncer::SyncChange::SyncChangeType image_change_type,
+                       syncer::SyncChange::SyncChangeType tracking_change_type);
 
   // Helper method to get favicon info from |synced_favicons_|. If no info
   // exists for |icon_url|, creates a new SyncedFaviconInfo in both