New snippets now replace old snippets and do not merge

components/ntp_snippets/ntp_snippets_database.h

Index: components/ntp_snippets/ntp_snippets_database.h
diff --git a/components/ntp_snippets/ntp_snippets_database.h b/components/ntp_snippets/ntp_snippets_database.h
index 983166235f0ca70265f66149e3ae6c9b6aa842d5..a065eae641dd5ff4f7c8c42ee9e21852a23f1b51 100644
--- a/components/ntp_snippets/ntp_snippets_database.h
+++ b/components/ntp_snippets/ntp_snippets_database.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/callback.h"
@@ -58,7 +59,7 @@ class NTPSnippetsDatabase {
 
   // Deletes the snippet with the given ID, and its image.

[Marc Treib, 2016/09/21 19:10:16]

I guess this one doesn't delete the image either anymore?

[jkrcal, 2016/09/22 09:12:41]

No, it does not. Comment fixed, thanks!

   void DeleteSnippet(const std::string& snippet_id);
-  // Deletes all the given snippets (identified by their IDs) and their images.
+  // Deletes all the given snippets (identified by their IDs), not their images.

[Marc Treib, 2016/09/21 19:10:16]

I'd just remove the part after the comma, IMO it's more confusing than helping.

[jkrcal, 2016/09/22 09:12:41]

Done.

   void DeleteSnippets(const NTPSnippet::PtrVector& snippets);
 
   // Loads the image data for the snippet with the given ID and passes it to
@@ -71,6 +72,8 @@ class NTPSnippetsDatabase {
 
   // Deletes the image data for the given snippet ID.
   void DeleteImage(const std::string& snippet_id);
+  // Deletes the image data for the given snippets (identified by their IDs).
+  void DeleteImages(const NTPSnippet::PtrVector& snippets);
 
  private:
   friend class NTPSnippetsDatabaseTest;