Address post commit comments for CL http://codereview.chromium.org/7828022/

chrome/browser/content_settings/content_settings_policy_provider.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/content_settings_policy_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 322 matching lines @@
       DCHECK_NE(content_type, CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE);
       // If only one pattern was defined auto expand it to a pattern pair.
       ContentSettingsPattern secondary_pattern =
           !pattern_pair.second.IsValid() ? ContentSettingsPattern::Wildcard()
                                          : pattern_pair.second;
       value_map->SetValue(
           pattern_pair.first,
           secondary_pattern,
           content_type,
           ResourceIdentifier(NO_RESOURCE_IDENTIFIER),
-          static_cast<Value*>(Value::CreateIntegerValue(
-              kPrefsForManagedContentSettingsMap[i].setting)));
+          Value::CreateIntegerValue(
+              kPrefsForManagedContentSettingsMap[i].setting));
     }
   }
 }
 
 void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(
     OriginIdentifierValueMap* value_map) {
   const char* pref_name = prefs::kManagedAutoSelectCertificateForUrls;
 
   if (!prefs_->HasPrefPath(pref_name)) {
     VLOG(2) << "Skipping unset preference: " << pref_name;
@@ skipping 26 matching lines @@
   //        "CN": "some name"
   //      }
   // }
   for (size_t j = 0; j < pattern_filter_str_list->GetSize(); ++j) {
     std::string pattern_filter_json;
     pattern_filter_str_list->GetString(j, &pattern_filter_json);
 
     scoped_ptr<Value> value(base::JSONReader::Read(pattern_filter_json, true));
     if (!value.get()) {
       VLOG(1) << "Ignoring invalid certificate auto select setting. Reason:"
-              << " Invalid JSON format: " << pattern_filter_json;
+                 " Invalid JSON format: " << pattern_filter_json;
       continue;
     }
 
     scoped_ptr<DictionaryValue> pattern_filter_pair(
         static_cast<DictionaryValue*>(value.release()));
     std::string pattern_str;
     bool pattern_read = pattern_filter_pair->GetString("pattern", &pattern_str);
     Value* cert_filter_ptr = NULL;
     bool filter_read = pattern_filter_pair->Remove("filter", &cert_filter_ptr);
     scoped_ptr<Value> cert_filter(cert_filter_ptr);
     if (!pattern_read || !filter_read) {
       VLOG(1) << "Ignoring invalid certificate auto select setting. Reason:"
-              << " Missing pattern or filtern.";
+                 " Missing pattern or filter.";
       continue;
     }
 
     ContentSettingsPattern pattern =
         ContentSettingsPattern::FromString(pattern_str);
     // Ignore invalid patterns.
     if (!pattern.IsValid()) {
       VLOG(1) << "Ignoring invalid certificate auto select setting:"
-              << " Invalid content settings pattern: " << pattern;
+                 " Invalid content settings pattern: " << pattern;
       continue;
     }
 
     DCHECK(cert_filter->IsType(Value::TYPE_DICTIONARY));
     value_map->SetValue(pattern,
                         ContentSettingsPattern::Wildcard(),
                         CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
                         std::string(),
                         cert_filter.release());
   }
 }
 
 void PolicyProvider::ReadManagedContentSettings(bool overwrite) {
-  {
-    base::AutoLock auto_lock(lock_);
-    if (overwrite)
-      value_map_.clear();
-    GetContentSettingsFromPreferences(&value_map_);
-    GetAutoSelectCertificateSettingsFromPreferences(&value_map_);
-  }
+  base::AutoLock auto_lock(lock_);
+  if (overwrite)
+    value_map_.clear();
+  GetContentSettingsFromPreferences(&value_map_);
+  GetAutoSelectCertificateSettingsFromPreferences(&value_map_);
 }
 
 // Since the PolicyProvider is a read only content settings provider, all
 // methodes of the ProviderInterface that set or delete any settings do nothing.
 void PolicyProvider::SetContentSetting(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
     ContentSetting content_setting) {
@@ skipping 98 matching lines @@
                       ContentSettingsPattern(),
                       CONTENT_SETTINGS_TYPE_DEFAULT,
                       std::string());
     }
   } else {
     NOTREACHED() << "Unexpected notification";
   }
 }
 
 }  // namespace content_settings