Many changes to DictionaryValues:...

chrome/browser/blocked_popup_container.cc

 // Copyright (c) 2009 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/blocked_popup_container.h"
 
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ skipping 373 matching lines @@
                                              Profile* profile)
     : owner_(owner),
       prefs_(profile->GetPrefs()),
       has_been_dismissed_(false),
       view_(NULL),
       profile_(profile) {
   // Copy whitelist pref into local member that's easier to use.
   const ListValue* whitelist_pref =
       prefs_->GetList(prefs::kPopupWhitelistedHosts);
   // Careful: The returned value could be NULL if the pref has never been set.
-  if (whitelist_pref != NULL) {
-    for (ListValue::const_iterator i(whitelist_pref->begin());
-         i != whitelist_pref->end(); ++i) {
-      std::string host;
-      (*i)->GetAsString(&host);
-      whitelist_.insert(host);
-    }
+  if (whitelist_pref == NULL)
+    return;
+  for (ListValue::const_iterator i(whitelist_pref->begin());
+       i != whitelist_pref->end(); ++i) {
+    std::string host;
+    (*i)->GetAsString(&host);
+    whitelist_.insert(host);
   }
 }
 
 void BlockedPopupContainer::UpdateView() {
   if (blocked_popups_.empty() && unblocked_popups_.empty() &&
       blocked_notices_.empty())
     HideSelf();
   else
     view_->UpdateLabel();
 }
 
 void BlockedPopupContainer::Observe(NotificationType type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
   TabContents* tab_contents = Source<TabContents>(source).ptr();
   UnblockedPopups::iterator i(unblocked_popups_.find(tab_contents));
   DCHECK(i != unblocked_popups_.end());
   EraseDataForPopupAndUpdateUI(i);
 }