[NTP Snippets] Cleanup: remove NTPSnippetsService::is_loaded()

components/ntp_snippets/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 "base/json/json_reader.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 61 matching lines @@
     const ntp_snippets::NTPSnippetsService::ErrorCallback& error_callback) {
   base::JSONReader json_reader;
   scoped_ptr<base::Value> value = json_reader.ReadToValue(json);
   if (value) {
     success_callback.Run(std::move(value));
   } else {
     error_callback.Run(json_reader.GetErrorMessage());
   }
 }
 
-class SnippetObserver : public NTPSnippetsServiceObserver {
- public:
-  SnippetObserver() : loaded_(false), shutdown_(false) {}
-  ~SnippetObserver() override {}
-
-  void NTPSnippetsServiceLoaded(NTPSnippetsService* service) override {
-    loaded_ = true;
-  }
-
-  void NTPSnippetsServiceShutdown(NTPSnippetsService* service) override {
-    shutdown_ = true;
-    loaded_ = false;
-  }
-
-  bool loaded_;
-  bool shutdown_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(SnippetObserver);
-};
-
 }  // namespace
 
 class NTPSnippetsServiceTest : public testing::Test {
  public:
   NTPSnippetsServiceTest()
       : pref_service_(new TestingPrefServiceSimple()) {}
   ~NTPSnippetsServiceTest() override {}
 
   void SetUp() override {
     NTPSnippetsService::RegisterProfilePrefs(pref_service_->registry());
@@ skipping 28 matching lines @@
   }
 
  private:
   base::MessageLoop message_loop_;
   scoped_ptr<TestingPrefServiceSimple> pref_service_;
   scoped_ptr<NTPSnippetsService> service_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsServiceTest);
 };
 
-TEST_F(NTPSnippetsServiceTest, Create) {
-  EXPECT_FALSE(service()->is_loaded());
-}
-
 TEST_F(NTPSnippetsServiceTest, Loop) {
-  EXPECT_FALSE(service()->is_loaded());
-
   std::string json_str(
       "{ \"recos\": [ "
       "{ \"contentInfo\": { \"url\" : \"http://localhost/foobar\" }}"
       "]}");
   ASSERT_TRUE(LoadFromJSONString(json_str));
 
-  EXPECT_TRUE(service()->is_loaded());
-
   // The same for loop without the '&' should not compile.
   for (auto& snippet : *service()) {
     // Snippet here is a const.
     EXPECT_EQ(snippet.url(), GURL("http://localhost/foobar"));
   }
   // Without the const, this should not compile.
   for (const NTPSnippet& snippet : *service()) {
     EXPECT_EQ(snippet.url(), GURL("http://localhost/foobar"));
   }
 }
@@ skipping 17 matching lines @@
     base::Time then =
         base::Time::FromUTCExploded({2015, 11, 4, 25, 13, 46, 45});
     EXPECT_EQ(then, snippet.publish_date());
   }
 }
 
 TEST_F(NTPSnippetsServiceTest, Discard) {
   std::string json_str(
       "{ \"recos\": [ { \"contentInfo\": { \"url\" : \"http://site.com\" }}]}");
   ASSERT_TRUE(LoadFromJSONString(json_str));
-  ASSERT_TRUE(service()->is_loaded());
 
   ASSERT_EQ(1u, service()->size());
 
   // Discarding a non-existent snippet shouldn't do anything.
   EXPECT_FALSE(service()->DiscardSnippet(GURL("http://othersite.com")));
   EXPECT_EQ(1u, service()->size());
 
   // Discard the snippet.
   EXPECT_TRUE(service()->DiscardSnippet(GURL("http://site.com")));
   EXPECT_EQ(0u, service()->size());
@@ skipping 27 matching lines @@
   }
 }
 
 TEST_F(NTPSnippetsServiceTest, RemoveExpiredContent) {
   std::string json_str(GetTestExpiredJson(1448459205));
 
   ASSERT_TRUE(LoadFromJSONString(json_str));
   EXPECT_EQ(service()->size(), 0u);
 }
 
-TEST_F(NTPSnippetsServiceTest, ObserverNotLoaded) {
-  SnippetObserver observer;
-  ScopedObserver<NTPSnippetsService, SnippetObserver> scoped_observer(
-      &observer);
-  scoped_observer.Add(service());
-  EXPECT_FALSE(observer.loaded_);
-
-  std::string json_str(
-      "{ \"recos\": [ "
-      "{ \"contentInfo\": { \"url\" : \"http://localhost/foobar\" }}"
-      "]}");
-  ASSERT_TRUE(LoadFromJSONString(json_str));
-  EXPECT_TRUE(observer.loaded_);
-}
-
-TEST_F(NTPSnippetsServiceTest, ObserverLoaded) {
-  std::string json_str(
-      "{ \"recos\": [ "
-      "{ \"contentInfo\": { \"url\" : \"http://localhost/foobar\" }}"
-      "]}");
-  ASSERT_TRUE(LoadFromJSONString(json_str));
-
-  SnippetObserver observer;
-  ScopedObserver<NTPSnippetsService, SnippetObserver> scoped_observer(
-      &observer);
-  scoped_observer.Add(service());
-
-  EXPECT_TRUE(observer.loaded_);
-}
-
 }  // namespace ntp_snippets