Simplify a method in UpgradeDetector.

chrome/browser/upgrade_detector.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/upgrade_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 20 matching lines @@
       switches::kCheckForUpdateIntervalSec).empty();
 }
 
 // static
 void UpgradeDetector::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kRestartLastSessionOnShutdown, false);
   registry->RegisterBooleanPref(prefs::kWasRestarted, false);
   registry->RegisterBooleanPref(prefs::kAttemptedToEnableAutoupdate, false);
 }
 
-int UpgradeDetector::GetIconResourceID(UpgradeNotificationIconType type) {
-  if (type == UPGRADE_ICON_TYPE_BADGE) {
-    // TODO(oshima): Badges no longer exist. remove this.
-    NOTREACHED();
-    return 0;
-  }
-
+int UpgradeDetector::GetIconResourceID() {
   switch (upgrade_notification_stage_) {
     case UPGRADE_ANNOYANCE_NONE:
       return 0;
     case UPGRADE_ANNOYANCE_LOW:
       return IDR_UPDATE_MENU_SEVERITY_LOW;
     case UPGRADE_ANNOYANCE_ELEVATED:
       return IDR_UPDATE_MENU_SEVERITY_MEDIUM;
     case UPGRADE_ANNOYANCE_HIGH:
       return IDR_UPDATE_MENU_SEVERITY_HIGH;
     case UPGRADE_ANNOYANCE_SEVERE:
@@ skipping 89 matching lines @@
       break;
     case IDLE_STATE_ACTIVE:
     case IDLE_STATE_UNKNOWN:
       break;
     default:
       NOTREACHED();  // Need to add any new value above (either providing
                      // automatic restart or show notification to user).
       break;
   }
 }