Misc. protector cleanup:

chrome/browser/protector/default_search_provider_change.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 <algorithm>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 268 matching lines @@
 
 int DefaultSearchProviderChange::GetBubbleIconID() const {
   return IDR_SEARCH_ENGINE_CHANGE_ALERT;
 }
 
 string16 DefaultSearchProviderChange::GetBubbleTitle() const {
   return l10n_util::GetStringUTF16(IDS_SEARCH_ENGINE_CHANGE_TITLE);
 }
 
 string16 DefaultSearchProviderChange::GetBubbleMessage() const {
-  if (!is_fallback_) {
-    return l10n_util::GetStringUTF16(IDS_SEARCH_ENGINE_CHANGE_MESSAGE);
-  } else {
+  if (is_fallback_) {
     return l10n_util::GetStringFUTF16(
         IDS_SEARCH_ENGINE_CHANGE_NO_BACKUP_MESSAGE,
         default_search_provider_->short_name());
   }
+  return l10n_util::GetStringUTF16(IDS_SEARCH_ENGINE_CHANGE_MESSAGE);
 }
 
 string16 DefaultSearchProviderChange::GetApplyButtonText() const {
   if (new_search_provider_) {
     // If backup search engine is lost and fallback was made to the current
     // search provider then there is no need to show this button.
     if (fallback_is_new_)
       return string16();
     string16 name = new_search_provider_->short_name();
-    if (name.length() > kMaxDisplayedNameLength)
-      return l10n_util::GetStringUTF16(IDS_CHANGE_SEARCH_ENGINE_NO_NAME);
-    else
-      return l10n_util::GetStringFUTF16(IDS_CHANGE_SEARCH_ENGINE, name);
-  } else if (!is_fallback_) {
-    // New setting is lost, offer to go to settings.
-    return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
-  } else {
+    return (name.length() > kMaxDisplayedNameLength) ?
+        l10n_util::GetStringUTF16(IDS_CHANGE_SEARCH_ENGINE_NO_NAME) :
+        l10n_util::GetStringFUTF16(IDS_CHANGE_SEARCH_ENGINE, name);
+  }
+  if (is_fallback_) {
     // Both settings are lost: don't show this button.
     return string16();
   }
+  // New setting is lost, offer to go to settings.
+  return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
 }
 
 string16 DefaultSearchProviderChange::GetDiscardButtonText() const {
   if (!is_fallback_) {
     string16 name = default_search_provider_->short_name();
-    if (name.length() > kMaxDisplayedNameLength)
-      return l10n_util::GetStringUTF16(IDS_KEEP_SETTING);
-    else
-      return l10n_util::GetStringFUTF16(IDS_KEEP_SEARCH_ENGINE, name);
-  } else {
-    // Old setting is lost, offer to go to settings.
-    return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
+    return (name.length() > kMaxDisplayedNameLength) ?
+        l10n_util::GetStringUTF16(IDS_KEEP_SETTING) :
+        l10n_util::GetStringFUTF16(IDS_KEEP_SEARCH_ENGINE, name);
   }
+  // Old setting is lost, offer to go to settings.
+  return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
 }
 
 void DefaultSearchProviderChange::OnTemplateURLServiceChanged() {
   TemplateURLService* url_service = GetTemplateURLService();
   if (url_service->GetDefaultSearchProvider() != default_search_provider_) {
     VLOG(1) << "Default search provider has been changed by user";
     default_search_provider_ = NULL;
     url_service->RemoveObserver(this);
     // Will delete this DefaultSearchProviderChange instance.
     ProtectorServiceFactory::GetForProfile(profile())->DismissChange(this);
@@ skipping 52 matching lines @@
            chrome::kSearchEnginesSubPage), browser);
 }
 
 TemplateURLService* DefaultSearchProviderChange::GetTemplateURLService() {
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   DCHECK(url_service);
   return url_service;
 }
 
-BaseSettingChange* CreateDefaultSearchProviderChange(
-    const TemplateURL* actual,
-    TemplateURL* backup) {
+BaseSettingChange* CreateDefaultSearchProviderChange(const TemplateURL* actual,
+                                                     TemplateURL* backup) {
   return new DefaultSearchProviderChange(actual, backup);
 }
 
 }  // namespace protector