Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers.

chrome/browser/content_settings/tab_specific_content_settings.cc

 // Copyright (c) 2011 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 "chrome/browser/content_settings/tab_specific_content_settings.h"
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 181 matching lines @@
 
   return content_accessed_[content_type];
 }
 
 const std::set<std::string>&
     TabSpecificContentSettings::BlockedResourcesForType(
         ContentSettingsType content_type) const {
   if (blocked_resources_[content_type].get()) {
     return *blocked_resources_[content_type];
   } else {
-    CR_DEFINE_STATIC_LOCAL(std::set<std::string>, empty_set, ());
+    static std::set<std::string> empty_set;
     return empty_set;
   }
 }
 
 void TabSpecificContentSettings::AddBlockedResource(
     ContentSettingsType content_type,
     const std::string& resource_identifier) {
   if (!blocked_resources_[content_type].get())
     blocked_resources_[content_type].reset(new std::set<std::string>());
   blocked_resources_[content_type]->insert(resource_identifier);
@@ skipping 313 matching lines @@
   return new CookiesTreeModel(cookies_->Clone(),
                               databases_->Clone(),
                               local_storages_->Clone(),
                               session_storages_->Clone(),
                               appcaches_->Clone(),
                               indexed_dbs_->Clone(),
                               file_systems_->Clone(),
                               NULL,
                               true);
 }