Move Singleton and related structs to namespace base

ios/chrome/browser/bookmarks/bookmark_model_factory.h

 // 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.
 
 #ifndef IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
 #define IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
 
+namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
-
+}  // namespace base
 namespace bookmarks {

[sdefresne, 2015/08/27 15:25:11]

nit: can you live a blank line?

 class BookmarkModel;
 }
 
 namespace ios {
 
 class ChromeBrowserState;
 
 // Singleton that owns all BookmarkModels and associates them with
 // ios::ChromeBrowserState.
 class BookmarkModelFactory : public BrowserStateKeyedServiceFactory {
  public:
   static bookmarks::BookmarkModel* GetForBrowserState(
       ios::ChromeBrowserState* browser_state);
   static bookmarks::BookmarkModel* GetForBrowserStateIfExists(
       ios::ChromeBrowserState* browser_state);
   static BookmarkModelFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<BookmarkModelFactory>;
+  friend struct base::DefaultSingletonTraits<BookmarkModelFactory>;
 
   BookmarkModelFactory();
   ~BookmarkModelFactory() override;
 
   // BrowserStateKeyedServiceFactory implementation.
   void RegisterBrowserStatePrefs(
       user_prefs::PrefRegistrySyncable* registry) override;
   scoped_ptr<KeyedService> BuildServiceInstanceFor(
       web::BrowserState* context) const override;
   web::BrowserState* GetBrowserStateToUse(
       web::BrowserState* context) const override;
   bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory);
 };
 
 }  // namespace ios
 
 #endif  // IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_