Ensure content settings aren't persisted in the guest profile

components/content_settings/core/browser/content_settings_pref.cc

 // Copyright 2015 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 "components/content_settings/core/browser/content_settings_pref.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 125 matching lines @@
                resource_identifier,
                value.get());
   }
 
   notify_callback_.Run(
       primary_pattern, secondary_pattern, content_type_, resource_identifier);
 
   return true;
 }
 
+void ContentSettingsPref::ClearPref() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(prefs_);
+
+  {
+    base::AutoLock auto_lock(lock_);
+    value_map_.clear();
+  }
+
+  {
+    base::AutoReset<bool> auto_reset(&updating_preferences_, true);
+    DictionaryPrefUpdate update(prefs_, pref_name_);
+    base::DictionaryValue* pattern_pairs_settings = update.Get();
+    pattern_pairs_settings->Clear();
+  }
+}
+
 void ContentSettingsPref::ClearAllContentSettingsRules() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(prefs_);
 
-  OriginIdentifierValueMap* map_to_modify = &incognito_value_map_;
-  if (!is_incognito_)
-    map_to_modify = &value_map_;
-
-  {
+  if (is_incognito_) {
     base::AutoLock auto_lock(lock_);
-    map_to_modify->clear();
-  }
-
-  if (!is_incognito_) {
-    // Clear the preference.
-    {
-      base::AutoReset<bool> auto_reset(&updating_preferences_, true);
-      DictionaryPrefUpdate update(prefs_, pref_name_);
-      base::DictionaryValue* pattern_pairs_settings = update.Get();
-      pattern_pairs_settings->Clear();
-    }
+    incognito_value_map_.clear();
+  } else {
+    ClearPref();
   }
 
   notify_callback_.Run(ContentSettingsPattern(),
                        ContentSettingsPattern(),
                        content_type_,
                        ResourceIdentifier());
 }
 
 void ContentSettingsPref::UpdateLastUsage(
     const ContentSettingsPattern& primary_pattern,
@@ skipping 326 matching lines @@
 
 void ContentSettingsPref::AssertLockNotHeld() const {
 #if !defined(NDEBUG)
   // |Lock::Acquire()| will assert if the lock is held by this thread.
   lock_.Acquire();
   lock_.Release();
 #endif
 }
 
 }  // namespace content_settings