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

Unified Diff: ipc/ipc_channel_posix.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: ipc/ipc_channel_posix.cc
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc
index b5e23328f0e2efa04fee6edaa86edd68f7515b68..79febbffe03021f8f42fdd58310779ea11ed1235 100644
--- a/ipc/ipc_channel_posix.cc
+++ b/ipc/ipc_channel_posix.cc
@@ -94,9 +94,7 @@ namespace {
class PipeMap {
public:
- static PipeMap* GetInstance() {
- return Singleton<PipeMap>::get();
- }
+ static PipeMap* GetInstance() { return base::Singleton<PipeMap>::get(); }
~PipeMap() {
// Shouldn't have left over pipes.
@@ -138,7 +136,7 @@ class PipeMap {
typedef std::map<std::string, int> ChannelToFDMap;
ChannelToFDMap map_;
- friend struct DefaultSingletonTraits<PipeMap>;
+ friend struct base::DefaultSingletonTraits<PipeMap>;
#if defined(OS_ANDROID)
friend void ::IPC::Channel::NotifyProcessForkedForTesting();
#endif

Powered by Google App Engine
This is Rietveld 408576698