Move Singleton and related structs to namespace base

content/browser/renderer_host/text_input_client_mac.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 CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_block.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/point.h"
 
-template <typename T> struct DefaultSingletonTraits;
+namespace base {
+template <typename T>
+struct DefaultSingletonTraits;
+}  // namespace base
 
 namespace content {
 class RenderWidgetHost;
 
 // This class helps with the Mac OS X dictionary popup. For the design overview,
 // look at this document:
 //   http://dev.chromium.org/developers/design-documents/system-dictionary-pop-up-architecture
 //
 // This service is used to marshall information for these three methods that are
 // implemented in RenderWidgetHostViewMac:
@@ skipping 47 matching lines @@
   // The callback parameters provide the attributed word under the point and
   // the lower left baseline point of the text.
   void GetStringAtPoint(RenderWidgetHost* rwh,
                         gfx::Point point,
                         void (^replyHandler)(NSAttributedString*, NSPoint));
   // This is called on the IO thread when we get the renderer's reply for
   // GetStringAtPoint.
   void GetStringAtPointReply(NSAttributedString*, NSPoint);
 
  private:
-  friend struct DefaultSingletonTraits<TextInputClientMac>;
+  friend struct base::DefaultSingletonTraits<TextInputClientMac>;
   TextInputClientMac();
   ~TextInputClientMac();
 
   // The critical sections that the Condition guards are in Get*() methods.
   // These methods lock the internal condition for use before the asynchronous
   // message is sent to the renderer to lookup the required information. These
   // are only used on the UI thread.
   void BeforeRequest();
   // Called at the end of a critical section. This will release the lock and
   // condition.
   void AfterRequest();
 
   NSUInteger character_index_;
   NSRect first_rect_;
   base::scoped_nsobject<NSAttributedString> substring_;
 
   base::Lock lock_;
   base::ConditionVariable condition_;
 
   base::mac::ScopedBlock<void(^)(NSAttributedString*, NSPoint)> replyHandler_;
 
   DISALLOW_COPY_AND_ASSIGN(TextInputClientMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_