Move Singleton and related structs to namespace base

remoting/client/jni/chromoting_jni_runtime.h

 // 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.
 
 #ifndef REMOTING_CLIENT_JNI_CHROMOTING_JNI_RUNTIME_H_
 #define REMOTING_CLIENT_JNI_CHROMOTING_JNI_RUNTIME_H_
 
 #include <jni.h>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/auto_thread.h"
 #include "remoting/client/jni/chromoting_jni_instance.h"
 #include "remoting/protocol/connection_to_host.h"
 
+namespace base {
 template<typename T> struct DefaultSingletonTraits;
+}
 
 namespace remoting {
 
 bool RegisterJni(JNIEnv* env);
 
 // Houses the global resources on which the Chromoting components run
 // (e.g. message loops and task runners). Proxies outgoing JNI calls from its
 // ChromotingJniInstance member to Java. All its methods should be invoked
 // exclusively from the UI thread unless otherwise noted.
 class ChromotingJniRuntime {
@@ skipping 100 matching lines @@
   // References to native threads.
   scoped_refptr<AutoThreadTaskRunner> ui_task_runner_;
   scoped_refptr<AutoThreadTaskRunner> network_task_runner_;
   scoped_refptr<AutoThreadTaskRunner> display_task_runner_;
 
   scoped_refptr<net::URLRequestContextGetter> url_requester_;
 
   // Contains all connection-specific state.
   scoped_refptr<ChromotingJniInstance> session_;
 
-  friend struct DefaultSingletonTraits<ChromotingJniRuntime>;
+  friend struct base::DefaultSingletonTraits<ChromotingJniRuntime>;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingJniRuntime);
 };
 
 }  // namespace remoting
 
 #endif