Lots of random cleanups, mostly for native_theme_win.cc:

chrome/browser/ui/libgtk2ui/gtk2_util.cc

Index: chrome/browser/ui/libgtk2ui/gtk2_util.cc
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_util.cc b/chrome/browser/ui/libgtk2ui/gtk2_util.cc
index 3138437fde2ed71b25511d10653f94e8ff3fc04d..e8f842cf50c99ddc25dbf6316fc3068ba36c7179 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_util.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_util.cc
@@ -132,11 +132,11 @@ void ClearAuraTransientParent(GtkWidget* dialog) {
 
 GtkStateType GetGtkState(ui::NativeTheme::State state) {
   switch (state) {
-    case ui::NativeTheme::kDisabled: return GTK_STATE_INSENSITIVE;
-    case ui::NativeTheme::kHovered:  return GTK_STATE_PRELIGHT;
-    case ui::NativeTheme::kNormal:   return GTK_STATE_NORMAL;
-    case ui::NativeTheme::kPressed:  return GTK_STATE_ACTIVE;
-    case ui::NativeTheme::kMaxState: NOTREACHED() << "Unknown state: " << state;
+    case ui::NativeTheme::kDisabled:  return GTK_STATE_INSENSITIVE;
+    case ui::NativeTheme::kHovered:   return GTK_STATE_PRELIGHT;
+    case ui::NativeTheme::kNormal:    return GTK_STATE_NORMAL;
+    case ui::NativeTheme::kPressed:   return GTK_STATE_ACTIVE;
+    case ui::NativeTheme::kNumStates: NOTREACHED();
   }
   return GTK_STATE_NORMAL;
 }