[NTP Snippets] Properly restore the status of restored sections

components/ntp_snippets/remote/ntp_snippets_service_unittest.cc

 // Copyright 2015 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_service.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 735 matching lines @@
   }
 }
 
 TEST_F(NTPSnippetsServiceTest, PersistCategoryInfos) {
   auto service = MakeSnippetsService();
 
   LoadFromJSONString(service.get(),
                      GetMultiCategoryJson({GetSnippetN(0)}, {GetSnippetN(1)},
                                           kUnknownRemoteCategoryId));
 
-  ASSERT_NE(observer().StatusForCategory(articles_category()),
-            CategoryStatus::NOT_PROVIDED);
-  ASSERT_NE(observer().StatusForCategory(unknown_category()),
-            CategoryStatus::NOT_PROVIDED);
+  ASSERT_EQ(observer().StatusForCategory(articles_category()),
+            CategoryStatus::AVAILABLE);
+  ASSERT_EQ(observer().StatusForCategory(unknown_category()),
+            CategoryStatus::AVAILABLE);
 
   CategoryInfo info_articles_before =
       service->GetCategoryInfo(articles_category());
   CategoryInfo info_unknown_before =
       service->GetCategoryInfo(unknown_category());
 
   // Recreate the service to simulate a Chrome restart.
   ResetSnippetsService(&service);
 
   // The categories should have been restored.
   ASSERT_NE(observer().StatusForCategory(articles_category()),
             CategoryStatus::NOT_PROVIDED);
   ASSERT_NE(observer().StatusForCategory(unknown_category()),
             CategoryStatus::NOT_PROVIDED);
 
+  EXPECT_EQ(observer().StatusForCategory(articles_category()),
+            CategoryStatus::AVAILABLE);
+  EXPECT_EQ(observer().StatusForCategory(unknown_category()),
+            CategoryStatus::AVAILABLE);
+
   CategoryInfo info_articles_after =
       service->GetCategoryInfo(articles_category());
   CategoryInfo info_unknown_after =
       service->GetCategoryInfo(unknown_category());
 
   EXPECT_EQ(info_articles_before.title(), info_articles_after.title());
   EXPECT_EQ(info_unknown_before.title(), info_unknown_after.title());
 }
 
 TEST_F(NTPSnippetsServiceTest, PersistSuggestions) {
   auto service = MakeSnippetsService();
 
   LoadFromJSONString(service.get(),
                      GetMultiCategoryJson({GetSnippetN(0)}, {GetSnippetN(1)}));
 
-  ASSERT_THAT(service->GetSnippetsForTesting(articles_category()), SizeIs(1));
-  ASSERT_THAT(service->GetSnippetsForTesting(other_category()), SizeIs(1));
+  ASSERT_THAT(observer().SuggestionsForCategory(articles_category()),
+              SizeIs(1));
+  ASSERT_THAT(observer().SuggestionsForCategory(other_category()), SizeIs(1));
 
   // Recreate the service to simulate a Chrome restart.
   ResetSnippetsService(&service);
 
   // The suggestions in both categories should have been restored.
-  EXPECT_THAT(service->GetSnippetsForTesting(articles_category()), SizeIs(1));
-  EXPECT_THAT(service->GetSnippetsForTesting(other_category()), SizeIs(1));
+  EXPECT_THAT(observer().SuggestionsForCategory(articles_category()),
+              SizeIs(1));
+  EXPECT_THAT(observer().SuggestionsForCategory(other_category()), SizeIs(1));
 }
 
 TEST_F(NTPSnippetsServiceTest, Clear) {
   auto service = MakeSnippetsService();
 
   std::string json_str(GetTestJson({GetSnippet()}));
 
   LoadFromJSONString(service.get(), json_str);
   EXPECT_THAT(service->GetSnippetsForTesting(articles_category()), SizeIs(1));
 
@@ skipping 480 matching lines @@
         base::StringPrintf("http://localhost/snippet-id-%d", i)));
   }
   LoadFromJSONString(service.get(), GetTestJson(suggestions));
   // TODO(tschumann): We should probably trim out any additional results and
   // only serve the MaxSnippetCount items.
   EXPECT_THAT(service->GetSnippetsForTesting(articles_category()),
               SizeIs(service->GetMaxSnippetCountForTesting() + 1));
 }
 
 }  // namespace ntp_snippets