[NTP Snippets] Another round of clang-tidy cleanups

components/ntp_snippets/remote/ntp_snippets_database.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/remote/ntp_snippets_database.h"
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "components/leveldb_proto/proto_database_impl.h"
@@ skipping 77 matching lines @@
     entries_to_save->emplace_back(snippet->id(), snippet->ToProto());
   }
   SaveSnippetsImpl(std::move(entries_to_save));
 }
 
 void NTPSnippetsDatabase::DeleteSnippet(const std::string& snippet_id) {
   DeleteSnippets(base::MakeUnique<std::vector<std::string>>(1, snippet_id));
 }
 
 void NTPSnippetsDatabase::DeleteSnippets(
-    std::unique_ptr<std::vector<std::string>> keys_to_remove) {
+    std::unique_ptr<std::vector<std::string>> snippet_ids) {
   DCHECK(IsInitialized());
 
   std::unique_ptr<KeyEntryVector> entries_to_save(new KeyEntryVector());
-  database_->UpdateEntries(std::move(entries_to_save),
-                           std::move(keys_to_remove),
+  database_->UpdateEntries(std::move(entries_to_save), std::move(snippet_ids),
                            base::Bind(&NTPSnippetsDatabase::OnDatabaseSaved,
                                       weak_ptr_factory_.GetWeakPtr()));
 }
 
 void NTPSnippetsDatabase::LoadImage(const std::string& snippet_id,
                                     const SnippetImageCallback& callback) {
   if (IsInitialized())
     LoadImageImpl(snippet_id, callback);
   else
     pending_image_callbacks_.emplace_back(snippet_id, callback);
@@ skipping 14 matching lines @@
       std::move(entries_to_save), base::MakeUnique<std::vector<std::string>>(),
       base::Bind(&NTPSnippetsDatabase::OnImageDatabaseSaved,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void NTPSnippetsDatabase::DeleteImage(const std::string& snippet_id) {
   DeleteImages(base::MakeUnique<std::vector<std::string>>(1, snippet_id));
 }
 
 void NTPSnippetsDatabase::DeleteImages(
-    std::unique_ptr<std::vector<std::string>> keys_to_remove) {
+    std::unique_ptr<std::vector<std::string>> snippet_ids) {
   DCHECK(IsInitialized());
   image_database_->UpdateEntries(
-      base::MakeUnique<ImageKeyEntryVector>(), std::move(keys_to_remove),
+      base::MakeUnique<ImageKeyEntryVector>(), std::move(snippet_ids),
       base::Bind(&NTPSnippetsDatabase::OnImageDatabaseSaved,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void NTPSnippetsDatabase::GarbageCollectImages(
     std::unique_ptr<std::set<std::string>> alive_snippet_ids) {
   DCHECK(image_database_initialized_);
   image_database_->LoadKeys(
       base::Bind(&NTPSnippetsDatabase::DeleteUnreferencedImages,
                  weak_ptr_factory_.GetWeakPtr(),
@@ skipping 154 matching lines @@
   for (const std::string& key : *image_keys) {
     if (references->count(key) == 0) {
       keys_to_remove->emplace_back(key);
     }
   }
   DeleteImages(std::move(keys_to_remove));
 }
 
 
 }  // namespace ntp_snippets