Move Singleton and related structs to namespace base

PRESUBMIT_test.py

 #!/usr/bin/env python
 # 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.
 
 import glob
 import json
 import os
 import re
 import subprocess
@@ skipping 371 matching lines @@
       MockFile('other/path/qux.h', ''),
       MockFile('other/path/qux.cc', ''),
     ]
     results = PRESUBMIT._CheckPatchFiles(mock_input_api, MockOutputApi())
     self.assertEqual(0, len(results))
 
 
 class CheckSingletonInHeadersTest(unittest.TestCase):
   def testSingletonInArbitraryHeader(self):
     diff_singleton_h = ['base::subtle::AtomicWord '
-                        'Singleton<Type, Traits, DifferentiatingType>::']
-    diff_foo_h = ['// Singleton<Foo> in comment.',
-                  'friend class Singleton<Foo>']
-    diff_bad_h = ['Foo* foo = Singleton<Foo>::get();']
+                        'base::Singleton<Type, Traits, DifferentiatingType>::']
+    diff_foo_h = ['// base::Singleton<Foo> in comment.',
+                  'friend class base::Singleton<Foo>']
+    diff_bad_h = ['Foo* foo = base::Singleton<Foo>::get();']
     mock_input_api = MockInputApi()
     mock_input_api.files = [MockAffectedFile('base/memory/singleton.h',
                                      diff_singleton_h),
                             MockAffectedFile('foo.h', diff_foo_h),
                             MockAffectedFile('bad.h', diff_bad_h)]
     warnings = PRESUBMIT._CheckSingletonInHeaders(mock_input_api,
                                                   MockOutputApi())
     self.assertEqual(1, len(warnings))
     self.assertEqual('error', warnings[0].type)
-    self.assertTrue('Found Singleton<T>' in warnings[0].message)
+    self.assertTrue('Found base::Singleton<T>' in warnings[0].message)
 
   def testSingletonInCC(self):
-    diff_cc = ['Foo* foo = Singleton<Foo>::get();']
+    diff_cc = ['Foo* foo = base::Singleton<Foo>::get();']
     mock_input_api = MockInputApi()
     mock_input_api.files = [MockAffectedFile('some/path/foo.cc', diff_cc)]
     warnings = PRESUBMIT._CheckSingletonInHeaders(mock_input_api,
                                                   MockOutputApi())
     self.assertEqual(0, len(warnings))
 
 
 class InvalidOSMacroNamesTest(unittest.TestCase):
   def testInvalidOSMacroNames(self):
     lines = ['#if defined(OS_WINDOWS)',
@@ skipping 500 matching lines @@
     self.assertTrue('HasInlineTag.java:4' in msgs[2].items)
 
     # Util Log usage
     self.assertEqual(2, len(msgs[3].items))
     self.assertTrue('HasAndroidLog.java:3' in msgs[3].items)
     self.assertTrue('IsInBasePackageButImportsLog.java:4' in msgs[3].items)
 
 
 if __name__ == '__main__':
   unittest.main()