ntp_tiles: Cleanup enum names

components/ntp_tiles/most_visited_sites.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_
 #define COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites_observer.h"
 #include "components/ntp_tiles/ntp_tile.h"
 #include "components/ntp_tiles/popular_sites.h"
+#include "components/ntp_tiles/tile_source.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "components/suggestions/suggestions_service.h"
 #include "url/gurl.h"
 
 namespace history {
 class TopSites;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
@@ skipping 64 matching lines @@
                    suggestions::SuggestionsService* suggestions,
                    std::unique_ptr<PopularSites> popular_sites,
                    std::unique_ptr<IconCacher> icon_cacher,
                    std::unique_ptr<MostVisitedSitesSupervisor> supervisor);
 
   ~MostVisitedSites() override;
 
   // Returns true if this object was created with a non-null provider for the
   // given NTP tile source. That source may or may not actually provide tiles,
   // depending on its configuration and the priority of different sources.
-  bool DoesSourceExist(NTPTileSource source) const;
+  bool DoesSourceExist(TileSource source) const;
 
   // Returns the corresponding object passed at construction.
   history::TopSites* top_sites() { return top_sites_.get(); }
   suggestions::SuggestionsService* suggestions() {
     return suggestions_service_;
   }
   PopularSites* popular_sites() { return popular_sites_.get(); }
   MostVisitedSitesSupervisor* supervisor() { return supervisor_.get(); }
 
   // Sets the observer, and immediately fetches the current suggestions.
@@ skipping 80 matching lines @@
   int num_sites_;
 
   std::unique_ptr<
       suggestions::SuggestionsService::ResponseCallbackList::Subscription>
       suggestions_subscription_;
 
   ScopedObserver<history::TopSites, history::TopSitesObserver>
       top_sites_observer_;
 
   // The main source of personal tiles - either TOP_SITES or SUGGESTIONS_SEVICE.
-  NTPTileSource mv_source_;
+  TileSource mv_source_;
 
   // Current set of tiles. Optional so that the observer can be notified
   // whenever it changes, including possibily an initial change from
   // !current_tiles_.has_value() to current_tiles_->empty().
   base::Optional<NTPTilesVector> current_tiles_;
 
   // For callbacks may be run after destruction, used exclusively for TopSites
   // (since it's used to detect whether there's a query in flight).
   base::WeakPtrFactory<MostVisitedSites> top_sites_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSites);
 };
 
 }  // namespace ntp_tiles
 
 #endif  // COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_