| Index: ipc/ipc_channel_posix.cc
|
| diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc
|
| index 977db226deb9e5203f8dd05da13caf70c6f8cb5a..424b2d14c4fd3dd4c19a81285da9376405606ce1 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
|
|
|