Many changes to DictionaryValues:...

chrome/installer/util/master_preferences.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/installer/util/master_preferences.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/common/json_value_serializer.h"
 
 namespace {
 const wchar_t* kDistroDict = L"distribution";
-
-
-}  // namespace
+}
 
 namespace installer_util {
 namespace master_preferences {
 const wchar_t kAltFirstRunBubble[] = L"oem_bubble";
 const wchar_t kAltShortcutText[] = L"alternate_shortcut_text";
 const wchar_t kChromeShortcutIconIndex[] = L"chrome_shortcut_icon_index";
 const wchar_t kCreateAllShortcuts[] = L"create_all_shortcuts";
 const wchar_t kDistroImportBookmarksPref[] = L"import_bookmarks";
 const wchar_t kDistroImportHistoryPref[] = L"import_history";
 const wchar_t kDistroImportHomePagePref[] = L"import_home_page";
@@ skipping 82 matching lines @@
     }
     launch_tabs.push_back(tab_entry);
   }
   return launch_tabs;
 }
 
 bool SetDistroBooleanPreference(DictionaryValue* prefs,
                                 const std::wstring& name,
                                 bool value) {
 
-  bool ret = false;
-  if (prefs && !name.empty()) {
-    std::wstring key(kDistroDict);
-    key.append(L"." + name);
-    if (prefs->SetBoolean(key, value))
-      ret = true;
-  }
-  return ret;
+  if (!prefs || name.empty())
+    return false;
+  prefs->SetBoolean(std::wstring(kDistroDict) + L"." + name, value);
+  return true;
 }
 
 }  // installer_util