Creating the NTP snippet service.

ios/chrome/browser/ntp_suggestions/ios_chrome_ntp_suggestions_service_factory.h

Index: ios/chrome/browser/ntp_suggestions/ios_chrome_ntp_suggestions_service_factory.h
diff --git a/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.h b/ios/chrome/browser/ntp_suggestions/ios_chrome_ntp_suggestions_service_factory.h
similarity index 52%
copy from ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.h
copy to ios/chrome/browser/ntp_suggestions/ios_chrome_ntp_suggestions_service_factory.h
index bb4652971759c84439f2fe8f6b328b3736624cbb..39ddc55c5f0f13877cbd950170d48720b0404d0d 100644
--- a/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.h
+++ b/ios/chrome/browser/ntp_suggestions/ios_chrome_ntp_suggestions_service_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_CLUSTER_SERVICE_FACTORY_H_
-#define IOS_CHROME_BROWSER_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_CLUSTER_SERVICE_FACTORY_H_
+#ifndef IOS_CHROME_BROWSER_NTP_SUGGESTIONS_IOS_CHROME_NTP_SUGGESTIONS_SERVICE_FACTORY_H_
+#define IOS_CHROME_BROWSER_NTP_SUGGESTIONS_IOS_CHROME_NTP_SUGGESTIONS_SERVICE_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -18,25 +18,25 @@ namespace ios {
 class ChromeBrowserState;
 }
 
-namespace enhanced_bookmarks {
+namespace ntp_suggestions {
+class NTPSuggestionsService;
+}  // namespace ntp_suggestions
 
-class BookmarkServerClusterService;
-
-// A factory to create BookmarkServerClusterService and associate them to
+// A factory to create NTPSuggestionsService and associate them to
 // ios::ChromeBrowserState.
-class BookmarkServerClusterServiceFactory
+class IOSChromeNTPSuggestionsServiceFactory
     : public BrowserStateKeyedServiceFactory {
  public:
-  static BookmarkServerClusterServiceFactory* GetInstance();
-  static BookmarkServerClusterService* GetForBrowserState(
+  static IOSChromeNTPSuggestionsServiceFactory* GetInstance();
+  static ntp_suggestions::NTPSuggestionsService* GetForBrowserState(
       ios::ChromeBrowserState* browser_state);
 
  private:
   friend struct base::DefaultSingletonTraits<
-      BookmarkServerClusterServiceFactory>;
+      IOSChromeNTPSuggestionsServiceFactory>;
 
-  BookmarkServerClusterServiceFactory();
-  ~BookmarkServerClusterServiceFactory() override;
+  IOSChromeNTPSuggestionsServiceFactory();
+  ~IOSChromeNTPSuggestionsServiceFactory() override;
 
   // BrowserStateKeyedServiceFactory implementation.
   scoped_ptr<KeyedService> BuildServiceInstanceFor(
@@ -44,9 +44,7 @@ class BookmarkServerClusterServiceFactory
   web::BrowserState* GetBrowserStateToUse(
       web::BrowserState* context) const override;
 
-  DISALLOW_COPY_AND_ASSIGN(BookmarkServerClusterServiceFactory);
+  DISALLOW_COPY_AND_ASSIGN(IOSChromeNTPSuggestionsServiceFactory);
 };
 
-}  // namespace enhanced_bookmarks
-
-#endif  // IOS_CHROME_BROWSER_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_CLUSTER_SERVICE_FACTORY_H_
+#endif  // IOS_CHROME_BROWSER_NTP_SUGGESTIONS_IOS_CHROME_NTP_SUGGESTIONS_SERVICE_FACTORY_H_