Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1118)

Unified Diff: base/memory/singleton_unittest.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more errors Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/memory/singleton_unittest.cc
diff --git a/base/memory/singleton_unittest.cc b/base/memory/singleton_unittest.cc
index dbff007ada7ecc27045acdff7082fb448024dab1..edce07c68b22292ea498abd89ba4bd1ed5836eff 100644
--- a/base/memory/singleton_unittest.cc
+++ b/base/memory/singleton_unittest.cc
@@ -5,7 +5,7 @@
#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 o
namespace {
COMPILE_ASSERT(DefaultSingletonTraits<int>::kRegisterAtExit == true, a);
@@ -147,7 +147,6 @@ 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:
@@ -285,3 +284,6 @@ TEST_F(SingletonTest, Alignment) {
EXPECT_ALIGNED(align128, 128);
EXPECT_ALIGNED(align4096, 4096);
}
+
+} // namespace
+} // namespace base

Powered by Google App Engine
This is Rietveld 408576698