voice_search_ui: Simplify code for displaying Booleans.

chrome/browser/ui/webui/voice_search_ui.cc

 // Copyright 2014 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/ui/webui/voice_search_ui.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
@@ skipping 68 matching lines @@
   results->SetString("value", value);
   list->Append(results.release());
 }
 
 void AddPair(base::ListValue* list,
              const base::StringPiece& key,
              const base::StringPiece& value) {
   AddPair16(list, UTF8ToUTF16(key), UTF8ToUTF16(value));
 }
 
+void AddPairBool(base::ListValue* list,
+                 const base::StringPiece& key,
+                 bool value) {
+  AddPair(list, key, value ? "Yes" : "No");
+}
+
 // Generate an empty data-pair which acts as a line break.
 void AddLineBreak(base::ListValue* list) {
   AddPair(list, "", "");
 }
 
 void AddSharedModulePlatformsOnFileThread(base::ListValue* list,
                                           const base::FilePath& path,
                                           base::Closure callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
@@ skipping 165 matching lines @@
           plugin_prefs->IsPluginEnabled(info)) {
         nacl_enabled = "Yes";
       }
     }
 #endif
 
     AddPair(list, "NaCl Enabled", nacl_enabled);
 
     HotwordService* hotword_service =
         HotwordServiceFactory::GetForProfile(profile_);
-    AddPair(list, "Microphone Present",
-            hotword_service && hotword_service->microphone_available() ? "Yes"
-                                                                       : "No");
+    AddPairBool(list, "Microphone Present",
+                hotword_service && hotword_service->microphone_available());
 
-    std::string audio_capture = "No";
-    if (profile_->GetPrefs()->GetBoolean(prefs::kAudioCaptureAllowed))
-      audio_capture = "Yes";
-    AddPair(list, "Audio Capture Allowed", audio_capture);
+    AddPairBool(list, "Audio Capture Allowed",
+                profile_->GetPrefs()->GetBoolean(prefs::kAudioCaptureAllowed));
 
     AddLineBreak(list);
   }
 
   // Adds information regarding languages to the list.
   void AddLanguageInfo(base::ListValue* list) {
     std::string locale =
 #if defined(OS_CHROMEOS)
         // On ChromeOS locale is per-profile.
         profile_->GetPrefs()->GetString(prefs::kApplicationLocale);
 #else
         g_browser_process->GetApplicationLocale();
 #endif
     AddPair(list, "Current Language", locale);
 
     AddPair(list,
             "Hotword Previous Language",
             profile_->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage));
 
     AddLineBreak(list);
   }
 
   // Adds information specific to the hotword configuration to the list.
   void AddHotwordInfo(base::ListValue* list)  {
     HotwordService* hotword_service =
         HotwordServiceFactory::GetForProfile(profile_);
-    std::string hotword_allowed = "No";
-    if (hotword_service && hotword_service->IsHotwordAllowed())
-      hotword_allowed = "Yes";
-    AddPair(list, "Hotword Module Installable", hotword_allowed);
+    AddPairBool(list, "Hotword Module Installable",
+                hotword_service && hotword_service->IsHotwordAllowed());
 
-    std::string search_enabled = "No";
-    if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled))
-      search_enabled = "Yes";
-    AddPair(list, "Hotword Search Enabled", search_enabled);
+    AddPairBool(list, "Hotword Search Enabled",
+                profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled));
 
-    std::string always_on_search_enabled = "No";
-    if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled))
-      always_on_search_enabled = "Yes";
-    AddPair(list, "Always-on Hotword Search Enabled", always_on_search_enabled);
+    AddPairBool(
+        list, "Always-on Hotword Search Enabled",
+        profile_->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled));
 
-    std::string audio_logging_enabled = "No";
-    if (hotword_service && hotword_service->IsOptedIntoAudioLogging())
-      audio_logging_enabled = "Yes";
-    AddPair(list, "Hotword Audio Logging Enabled", audio_logging_enabled);
+    AddPairBool(list, "Hotword Audio Logging Enabled",
+                hotword_service && hotword_service->IsOptedIntoAudioLogging());
 
     AddLineBreak(list);
   }
 
   // Adds information specific to an extension to the list.
   void AddExtensionInfo(const std::string& extension_id,
                         const std::string& name_prefix,
                         base::ListValue* list) {
     DCHECK(!name_prefix.empty());
     std::string version("undefined");
@@ skipping 101 matching lines @@
 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui)
     : content::WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   web_ui->AddMessageHandler(new VoiceSearchDomHandler(profile));
 
   // Set up the about:voicesearch source.
   content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource());
 }
 
 VoiceSearchUI::~VoiceSearchUI() {}