Support server categories in NTPSnippetsService.

components/ntp_snippets/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/ntp_snippets_database.h"
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "components/leveldb_proto/proto_database_impl.h"
@@ skipping 79 matching lines @@
 
 void NTPSnippetsDatabase::DeleteSnippets(
     const NTPSnippet::PtrVector& snippets) {
   std::unique_ptr<std::vector<std::string>> keys_to_remove(
       new std::vector<std::string>());
   for (const std::unique_ptr<NTPSnippet>& snippet : snippets)
     keys_to_remove->emplace_back(snippet->id());
   DeleteSnippetsImpl(std::move(keys_to_remove));
 }
 
-void NTPSnippetsDatabase::LoadImage(const std::string& snippet_id,
+void NTPSnippetsDatabase::LoadImage(const std::string& suggestion_id,
                                     const SnippetImageCallback& callback) {
   if (IsInitialized())
-    LoadImageImpl(snippet_id, callback);
+    LoadImageImpl(suggestion_id, callback);
   else
-    pending_image_callbacks_.emplace_back(snippet_id, callback);
+    pending_image_callbacks_.emplace_back(suggestion_id, callback);
 }
 
-void NTPSnippetsDatabase::SaveImage(const std::string& snippet_id,
+void NTPSnippetsDatabase::SaveImage(const std::string& suggestion_id,
                                     const std::string& image_data) {
   DCHECK(IsInitialized());
 
   SnippetImageProto image_proto;
   image_proto.set_data(image_data);
 
   std::unique_ptr<ImageKeyEntryVector> entries_to_save(
       new ImageKeyEntryVector());
-  entries_to_save->emplace_back(snippet_id, std::move(image_proto));
+  entries_to_save->emplace_back(suggestion_id, std::move(image_proto));
 
   image_database_->UpdateEntries(
       std::move(entries_to_save),
       base::WrapUnique(new std::vector<std::string>()),
       base::Bind(&NTPSnippetsDatabase::OnImageDatabaseSaved,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void NTPSnippetsDatabase::DeleteImage(const std::string& snippet_id) {
+void NTPSnippetsDatabase::DeleteImage(const std::string& suggestion_id) {
   DeleteImagesImpl(
-      base::WrapUnique(new std::vector<std::string>(1, snippet_id)));
+      base::WrapUnique(new std::vector<std::string>(1, suggestion_id)));
 }
 
 void NTPSnippetsDatabase::OnDatabaseInited(bool success) {
   DCHECK(!database_initialized_);
   if (!success) {
     DVLOG(1) << "NTPSnippetsDatabase init failed.";
     OnDatabaseError();
     return;
   }
   database_initialized_ = true;
@@ skipping 123 matching lines @@
   DeleteImagesImpl(
       base::WrapUnique(new std::vector<std::string>(*keys_to_remove)));
 
   std::unique_ptr<KeyEntryVector> entries_to_save(new KeyEntryVector());
   database_->UpdateEntries(std::move(entries_to_save),
                            std::move(keys_to_remove),
                            base::Bind(&NTPSnippetsDatabase::OnDatabaseSaved,
                                       weak_ptr_factory_.GetWeakPtr()));
 }
 
-void NTPSnippetsDatabase::LoadImageImpl(const std::string& snippet_id,
+void NTPSnippetsDatabase::LoadImageImpl(const std::string& suggestion_id,
                                         const SnippetImageCallback& callback) {
   DCHECK(IsInitialized());
   image_database_->GetEntry(
-      snippet_id,
-      base::Bind(&NTPSnippetsDatabase::OnImageDatabaseLoaded,
-                 weak_ptr_factory_.GetWeakPtr(), callback));
+      suggestion_id, base::Bind(&NTPSnippetsDatabase::OnImageDatabaseLoaded,
+                                weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void NTPSnippetsDatabase::DeleteImagesImpl(
     std::unique_ptr<std::vector<std::string>> keys_to_remove) {
   DCHECK(IsInitialized());
 
   image_database_->UpdateEntries(
       base::WrapUnique(new ImageKeyEntryVector()),
       std::move(keys_to_remove),
       base::Bind(&NTPSnippetsDatabase::OnImageDatabaseSaved,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 }  // namespace ntp_snippets