Consistently decorate pref values sent to the settings UI code

chrome/browser/automation/testing_automation_provider_chromeos.cc

 // Copyright (c) 2012 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/automation/testing_automation_provider.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/command_line.h"
@@ skipping 69 matching lines @@
   item->SetBoolean("encrypted", wifi->encrypted());
   item->SetString("encryption", wifi->GetEncryptionString());
   return item;
 }
 
 base::Value* GetProxySetting(Browser* browser,
                              const std::string& setting_name) {
   std::string setting_path = "cros.session.proxy.";
   setting_path.append(setting_name);
 
-  if (setting_name == "ignorelist") {
+  base::Value* setting;
+  if (chromeos::proxy_cros_settings_parser::GetProxyPrefValue(
+          browser->profile(), setting_path, &setting)) {
+    DictionaryValue* setting_dict = static_cast<DictionaryValue*>(setting);
     base::Value* value;
-    if (chromeos::proxy_cros_settings_parser::GetProxyPrefValue(
-            browser->profile(), setting_path, &value)) {
-       return value;
-    }
-  } else {
-    base::Value* setting;
-    if (chromeos::proxy_cros_settings_parser::GetProxyPrefValue(
-            browser->profile(), setting_path, &setting)) {
-      DictionaryValue* setting_dict = static_cast<DictionaryValue*>(setting);
-      base::Value* value;
-      bool found = setting_dict->Remove("value", &value);
-      delete setting;
-      if (found)
-        return value;
-    }
+    bool found = setting_dict->Remove("value", &value);
+    delete setting;

[James Hawkins, 2012/08/07 17:59:05]

nit: Wrap the returned value in a scoped_ptr instead of manually deleting.

[bartfab (slow), 2012/08/07 18:27:05]

Done.

+    if (found)
+      return value;
   }
+
   return NULL;
 }
 
 const char* UpdateStatusToString(
     UpdateEngineClient::UpdateStatusOperation status) {
   switch (status) {
     case UpdateEngineClient::UPDATE_STATUS_IDLE:
       return "idle";
     case UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE:
       return "checking for update";
@@ skipping 1341 matching lines @@
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(power_manager_observer_);
 }
 
 void TestingAutomationProvider::RemoveChromeosObservers() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(power_manager_observer_);
   delete power_manager_observer_;
   power_manager_observer_ = NULL;
 }