Move Singleton and related structs to namespace base

base/memory/singleton_unittest.cc

 // 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.
 
 #include "base/at_exit.h"
 #include "base/memory/singleton.h"
 #include "testing/gtest/include/gtest/gtest.h"
-

[rvargas (doing something else), 2015/08/21 19:43:05]

Don't remove this line

+namespace base {

[rvargas (doing something else), 2015/08/21 19:43:05]

I don't like to place tests inside the namespace of the code under test.

When someone is going through a random test to figure out why it is failing,
being as explicit as possible about where the code comes from is a good thing.
It may not be much of an issue in this specific case, but code may come from the
test file's anon namespace, or from the code under test, or from the OS, or from
any other file/library included here (more of an issue for tests outside of
base, but still).

It may be harder to write, but it is easier on the reader.

 namespace {
 
 COMPILE_ASSERT(DefaultSingletonTraits<int>::kRegisterAtExit == true, a);
 
 typedef void (*CallbackFunc)();
 
 class IntSingleton {
  public:
   static IntSingleton* GetInstance() {
     return Singleton<IntSingleton>::get();
@@ skipping 121 matching lines @@
 }
 
 void SingletonStatic(CallbackFunc CallOnQuit) {
   CallbackSingletonWithStaticTrait::GetInstance()->callback_ = CallOnQuit;
 }
 
 CallbackFunc* GetStaticSingleton() {
   return &CallbackSingletonWithStaticTrait::GetInstance()->callback_;
 }
 
-}  // namespace

[rvargas (doing something else), 2015/08/21 19:43:05]

nit: Keep the tests outside of the anon namespace?

 
 class SingletonTest : public testing::Test {
  public:
   SingletonTest() {}
 
   void SetUp() override {
     non_leak_called_ = false;
     leaky_called_ = false;
     static_called_ = false;
   }
@@ skipping 117 matching lines @@
   AlignedTestSingleton<AlignedMemory<128, 128> >* align128 =
       AlignedTestSingleton<AlignedMemory<128, 128> >::GetInstance();
   AlignedTestSingleton<AlignedMemory<4096, 4096> >* align4096 =
       AlignedTestSingleton<AlignedMemory<4096, 4096> >::GetInstance();
 
   EXPECT_ALIGNED(align4, 4);
   EXPECT_ALIGNED(align32, 32);
   EXPECT_ALIGNED(align128, 128);
   EXPECT_ALIGNED(align4096, 4096);
 }
+
+}  // namespace
+}  // namespace base