[NTP Snippets] Cleanups from clang-tidy

components/ntp_snippets/content_suggestions_service_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/content_suggestions_service.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/category_status.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
 
-using testing::ByRef;
-using testing::Const;
 using testing::ElementsAre;
 using testing::Eq;
 using testing::InvokeWithoutArgs;
 using testing::IsEmpty;
-using testing::IsNull;
 using testing::Mock;
-using testing::NotNull;
 using testing::Property;
 using testing::_;
 
 namespace ntp_snippets {
 
 namespace {
 
 // Returns a suggestion instance for testing.
 ContentSuggestion CreateSuggestion(int number) {
   return ContentSuggestion(
@@ skipping 20 matching lines @@
   }
 
   void SetProvidedCategories(const std::vector<Category>& provided_categories) {
     statuses_.clear();
     provided_categories_ = provided_categories;
     for (Category category : provided_categories) {
       statuses_[category.id()] = CategoryStatus::AVAILABLE;
     }
   }
 
-  CategoryStatus GetCategoryStatus(Category category) {
+  CategoryStatus GetCategoryStatus(Category category) override {
     return statuses_[category.id()];
   }
 
-  CategoryInfo GetCategoryInfo(Category category) {
+  CategoryInfo GetCategoryInfo(Category category) override {
     return CategoryInfo(base::ASCIIToUTF16("Section title"),
                         ContentSuggestionsCardLayout::FULL_CARD, true, true);
   }
 
   void FireSuggestionsChanged(Category category,
                               const std::vector<int>& numbers) {
     observer()->OnNewSuggestions(this, category, CreateSuggestions(numbers));
   }
 
   void FireCategoryStatusChanged(Category category, CategoryStatus new_status) {
@@ skipping 25 matching lines @@
                void(const std::string& suggestion_id,
                     const ImageFetchedCallback& callback));
 
  private:
   std::vector<Category> provided_categories_;
   std::map<int, CategoryStatus> statuses_;
 };
 
 class MockServiceObserver : public ContentSuggestionsService::Observer {
  public:
+  MockServiceObserver() = default;
+  ~MockServiceObserver() override = default;
+
   MOCK_METHOD1(OnNewSuggestions, void(Category category));
   MOCK_METHOD2(OnCategoryStatusChanged,
                void(Category changed_category, CategoryStatus new_status));
   MOCK_METHOD2(OnSuggestionInvalidated,
                void(Category category, const std::string& suggestion_id));
   MOCK_METHOD0(ContentSuggestionsServiceShutdown, void());
-  ~MockServiceObserver() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockServiceObserver);
 };
 
 }  // namespace
 
 class ContentSuggestionsServiceTest : public testing::Test {
  public:
   ContentSuggestionsServiceTest() {}
 
   void SetUp() override {
     CreateContentSuggestionsService(ContentSuggestionsService::State::ENABLED);
@@ skipping 434 matching lines @@
   Category category = FromKnownCategory(KnownCategories::DOWNLOADS);
   MockProvider* provider = RegisterProvider(category);
   base::Time begin = base::Time::FromTimeT(123),
              end = base::Time::FromTimeT(456);
   EXPECT_CALL(*provider, ClearHistory(begin, end, _));
   base::Callback<bool(const GURL& url)> filter;
   service()->ClearHistory(begin, end, filter);
 }
 
 }  // namespace ntp_snippets