Move Singleton and related structs to namespace base

chrome/browser/ui/webui/chrome_web_ui_controller_factory.h

 // Copyright (c) 2012 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 CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 #include "components/favicon_base/favicon_callback.h"
@@ skipping 27 matching lines @@
       const std::vector<int>& desired_sizes_in_pixel,
       const favicon_base::FaviconResultsCallback& callback) const;
 
   static ChromeWebUIControllerFactory* GetInstance();
 
  protected:
   ChromeWebUIControllerFactory();
   ~ChromeWebUIControllerFactory() override;
 
  private:
-  friend struct DefaultSingletonTraits<ChromeWebUIControllerFactory>;
+  friend struct base::DefaultSingletonTraits<ChromeWebUIControllerFactory>;
 
   // Gets the data for the favicon for a WebUI page. Returns NULL if the WebUI
   // does not have a favicon.
   // The returned favicon data must be
   // |gfx::kFaviconSize| x |gfx::kFaviconSize| DIP. GetFaviconForURL() should
   // be updated if this changes.
   base::RefCountedMemory* GetFaviconResourceBytes(
       const GURL& page_url, ui::ScaleFactor scale_factor) const;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeWebUIControllerFactory);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_