Move Singleton and related structs to namespace base

extensions/browser/extension_function.cc

 // 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.
 
 #include "extensions/browser/extension_function.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 123 matching lines @@
   // alive.
   bool HaveGesture();
 
   // These should be called when a ScopedUserGestureForTests object is
   // created/destroyed respectively.
   void IncrementCount();
   void DecrementCount();
 
  private:
   UserGestureForTests();
-  friend struct DefaultSingletonTraits<UserGestureForTests>;
+  friend struct base::DefaultSingletonTraits<UserGestureForTests>;
 
   base::Lock lock_; // for protecting access to count_
   int count_;
 };
 
 // static
 UserGestureForTests* UserGestureForTests::GetInstance() {
-  return Singleton<UserGestureForTests>::get();
+  return base::Singleton<UserGestureForTests>::get();
 }
 
 UserGestureForTests::UserGestureForTests() : count_(0) {}
 
 bool UserGestureForTests::HaveGesture() {
   base::AutoLock autolock(lock_);
   return count_ > 0;
 }
 
 void UserGestureForTests::IncrementCount() {
@@ skipping 389 matching lines @@
 
 ExtensionFunction::ResponseAction SyncIOThreadExtensionFunction::Run() {
   return RespondNow(RunSync() ? ArgumentList(results_.Pass()) : Error(error_));
 }
 
 // static
 bool SyncIOThreadExtensionFunction::ValidationFailure(
     SyncIOThreadExtensionFunction* function) {
   return false;
 }