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

BUG=81825
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100147 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 13 deletions

diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc
index a47af2b..4501736 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider.cc
+++ b/chrome/browser/content_settings/content_settings_policy_provider.cc
@@ -340,8 +340,8 @@ void PolicyProvider::GetContentSettingsFromPreferences(
           secondary_pattern,
           content_type,
           ResourceIdentifier(NO_RESOURCE_IDENTIFIER),
-          static_cast<Value*>(Value::CreateIntegerValue(
-              kPrefsForManagedContentSettingsMap[i].setting)));
+          Value::CreateIntegerValue(
+              kPrefsForManagedContentSettingsMap[i].setting));
     }
   }
 }
@@ -388,7 +388,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(
     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;
     }
 
@@ -401,7 +401,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(
     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;
     }
 
@@ -410,7 +410,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(
     // 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;
     }
 
@@ -424,13 +424,11 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(
 }
 
 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
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 5072377..f05ef0a 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -189,7 +189,7 @@ ContentSettings HostContentSettingsMap::GetDefaultContentSettings() const {
   ContentSettings output(CONTENT_SETTING_DEFAULT);
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     if (!ContentTypeHasCompoundValue(ContentSettingsType(i)))
-        output.settings[i] = GetDefaultContentSetting(ContentSettingsType(i));
+      output.settings[i] = GetDefaultContentSetting(ContentSettingsType(i));
   }
   return output;
 }