Revert 108982 - content: Remove 16 exit time destructors and 15 static initializers.

BUG=101600,94925
TEST=none
TBR=ben

Review URL: http://codereview.chromium.org/8493016

TBR=thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10021037

git-svn-id: svn://svn.chromium.org/chrome/branches/1084/src@132652 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 17 deletions

diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc
index 7226c48..b73063a 100644
--- a/content/common/np_channel_base.cc
+++ b/content/common/np_channel_base.cc
@@ -17,8 +17,8 @@
 #endif
 
 typedef base::hash_map<std::string, scoped_refptr<NPChannelBase> > ChannelMap;
-static base::LazyInstance<ChannelMap>::Leaky
-     g_channels = LAZY_INSTANCE_INITIALIZER;
+static ChannelMap g_channels_;
+
 
 typedef std::stack<scoped_refptr<NPChannelBase> > NPChannelRefStack;
 static base::LazyInstance<NPChannelRefStack>::Leaky
@@ -30,8 +30,8 @@ NPChannelBase* NPChannelBase::GetChannel(
     bool create_pipe_now, base::WaitableEvent* shutdown_event) {
   scoped_refptr<NPChannelBase> channel;
   std::string channel_key = channel_handle.name;
-  ChannelMap::const_iterator iter = g_channels.Get().find(channel_key);
-  if (iter == g_channels.Get().end()) {
+  ChannelMap::const_iterator iter = g_channels_.find(channel_key);
+  if (iter == g_channels_.end()) {
     channel = factory();
   } else {
     channel = iter->second;
@@ -47,7 +47,7 @@ NPChannelBase* NPChannelBase::GetChannel(
     }
     channel->mode_ = mode;
     if (channel->Init(ipc_message_loop, create_pipe_now, shutdown_event)) {
-      g_channels.Get()[channel_key] = channel;
+      g_channels_[channel_key] = channel;
     } else {
       channel = NULL;
     }
@@ -57,8 +57,8 @@ NPChannelBase* NPChannelBase::GetChannel(
 }
 
 void NPChannelBase::Broadcast(IPC::Message* message) {
-  for (ChannelMap::iterator iter = g_channels.Get().begin();
-       iter != g_channels.Get().end();
+  for (ChannelMap::iterator iter = g_channels_.begin();
+       iter != g_channels_.end();
        ++iter) {
     iter->second->Send(new IPC::Message(*message));
   }
@@ -79,15 +79,15 @@ NPChannelBase::~NPChannelBase() {
 }
 
 NPChannelBase* NPChannelBase::GetCurrentChannel() {
-  return g_lazy_channel_stack.Pointer()->top();
+  return lazy_channel_stack_.Pointer()->top();
 }
 
 void NPChannelBase::CleanupChannels() {
   // Make a copy of the references as we can't iterate the map since items will
   // be removed from it as we clean them up.
   std::vector<scoped_refptr<NPChannelBase> > channels;
-  for (ChannelMap::const_iterator iter = g_channels.Get().begin();
-       iter != g_channels.Get().end();
+  for (ChannelMap::const_iterator iter = g_channels_.begin();
+       iter != g_channels_.end();
        ++iter) {
     channels.push_back(iter->second);
   }
@@ -97,7 +97,7 @@ void NPChannelBase::CleanupChannels() {
 
   // This will clean up channels added to the map for which subsequent
   // AddRoute wasn't called
-  g_channels.Get().clear();
+  g_channels_.clear();
 }
 
 NPObjectBase* NPChannelBase::GetNPObjectListenerForRoute(int route_id) {
@@ -155,13 +155,13 @@ bool NPChannelBase::Send(IPC::Message* message) {
 }
 
 int NPChannelBase::Count() {
-  return static_cast<int>(g_channels.Get().size());
+  return static_cast<int>(g_channels_.size());
 }
 
 bool NPChannelBase::OnMessageReceived(const IPC::Message& message) {
   // This call might cause us to be deleted, so keep an extra reference to
   // ourself so that we can send the reply and decrement back in_dispatch_.
-  g_lazy_channel_stack.Pointer()->push(
+  lazy_channel_stack_.Pointer()->push(
       scoped_refptr<NPChannelBase>(this));
 
   bool handled;
@@ -182,7 +182,7 @@ bool NPChannelBase::OnMessageReceived(const IPC::Message& message) {
   if (message.should_unblock())
     in_unblock_dispatch_--;
 
-  g_lazy_channel_stack.Pointer()->pop();
+  lazy_channel_stack_.Pointer()->pop();
   return handled;
 }
 
@@ -236,10 +236,10 @@ void NPChannelBase::RemoveRoute(int route_id) {
       }
     }
 
-    for (ChannelMap::iterator iter = g_channels.Get().begin();
-         iter != g_channels.Get().end(); ++iter) {
+    for (ChannelMap::iterator iter = g_channels_.begin();
+         iter != g_channels_.end(); ++iter) {
       if (iter->second == this) {
-        g_channels.Get().erase(iter);
+        g_channels_.erase(iter);
         return;
       }
     }