New snippets now replace old snippets and do not merge

components/ntp_snippets/ntp_snippets_database_unittest.cc

 // Copyright 2016 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 "components/ntp_snippets/ntp_snippets_database.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 231 matching lines @@
   // Delete the snippet.
   db()->DeleteSnippet(snippet->id());
 
   // Make sure it's gone.
   EXPECT_CALL(*this, OnSnippetsLoadedImpl(IsEmpty()));
   db()->LoadSnippets(base::Bind(&NTPSnippetsDatabaseTest::OnSnippetsLoaded,
                                 base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
 }
 
-TEST_F(NTPSnippetsDatabaseTest, DeleteSnippetAlsoDeletesImage) {
+TEST_F(NTPSnippetsDatabaseTest, DeleteSnippetDoesNotDeleteImage) {
   CreateDatabase();
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(db()->IsInitialized());
 
   std::unique_ptr<NTPSnippet> snippet = CreateTestSnippet();
   std::string image_data("pretty image");
 
   // Store a snippet and image.
   db()->SaveSnippet(*snippet);
   db()->SaveImage(snippet->id(), image_data);
   base::RunLoop().RunUntilIdle();
 
   // Make sure they're there.
   EXPECT_CALL(*this,
               OnSnippetsLoadedImpl(ElementsAre(SnippetEq(snippet.get()))));
   db()->LoadSnippets(base::Bind(&NTPSnippetsDatabaseTest::OnSnippetsLoaded,
                                 base::Unretained(this)));
   EXPECT_CALL(*this, OnImageLoaded(image_data));
   db()->LoadImage(snippet->id(),
                   base::Bind(&NTPSnippetsDatabaseTest::OnImageLoaded,
                              base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
 
   Mock::VerifyAndClearExpectations(this);
 
   // Delete the snippet.
   db()->DeleteSnippet(snippet->id());
 
+  // Make sure the image is still there.
+  EXPECT_CALL(*this, OnImageLoaded(image_data));
+  db()->LoadImage(snippet->id(),
+                  base::Bind(&NTPSnippetsDatabaseTest::OnImageLoaded,
+                             base::Unretained(this)));
+  base::RunLoop().RunUntilIdle();
+}
+
+TEST_F(NTPSnippetsDatabaseTest, DeleteImage) {
+  CreateDatabase();
+  base::RunLoop().RunUntilIdle();
+  ASSERT_TRUE(db()->IsInitialized());
+
+  std::unique_ptr<NTPSnippet> snippet = CreateTestSnippet();
+  std::string image_data("pretty image");
+
+  // Store the image.
+  db()->SaveImage(snippet->id(), image_data);
+  base::RunLoop().RunUntilIdle();
+
+  // Make sure the image is there.
+  EXPECT_CALL(*this, OnImageLoaded(image_data));
+  db()->LoadImage(snippet->id(),
+                  base::Bind(&NTPSnippetsDatabaseTest::OnImageLoaded,
+                             base::Unretained(this)));
+  base::RunLoop().RunUntilIdle();
+
+  Mock::VerifyAndClearExpectations(this);
+
+  // Delete the snippet.
+  db()->DeleteImage(snippet->id());
+
   // Make sure the image is gone.
   EXPECT_CALL(*this, OnImageLoaded(std::string()));
   db()->LoadImage(snippet->id(),
                   base::Bind(&NTPSnippetsDatabaseTest::OnImageLoaded,
                              base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace ntp_snippets