Revert of Fix icon on Windows XP taskbar

ui/gfx/win/window_impl.cc

Index: ui/gfx/win/window_impl.cc
diff --git a/ui/gfx/win/window_impl.cc b/ui/gfx/win/window_impl.cc
index 5b1159e3aa2e2e7ce8d8904c6649e62ab840ae9d..b0c4fa7ad34349c7e10bb7a5663d13287ee65cec 100644
--- a/ui/gfx/win/window_impl.cc
+++ b/ui/gfx/win/window_impl.cc
@@ -33,12 +33,10 @@
 struct ClassInfo {
   UINT style;
   HICON icon;
-  HICON small_icon;
-
-  ClassInfo(int style, HICON icon, HICON small_icon)
+
+  ClassInfo(int style, HICON icon)
       : style(style),
-        icon(icon),
-        small_icon(small_icon) {}
+        icon(icon) {}
 
   // Compares two ClassInfos. Returns true if all members match.
   bool Equals(const ClassInfo& other) const {
@@ -137,7 +135,7 @@
       reinterpret_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)),
       NULL,
       class_info.icon,
-      class_info.small_icon,
+      class_info.icon,
       &window_class);
   HMODULE instance = window_class.hInstance;
   ATOM atom = RegisterClassEx(&window_class);
@@ -261,10 +259,6 @@
   return NULL;
 }
 
-HICON WindowImpl::GetSmallWindowIcon() const {
-  return NULL;
-}
-
 LRESULT WindowImpl::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) {
   LRESULT result = 0;
 
@@ -311,8 +305,7 @@
 
 ATOM WindowImpl::GetWindowClassAtom() {
   HICON icon = GetDefaultWindowIcon();
-  HICON small_icon = GetSmallWindowIcon();
-  ClassInfo class_info(initial_class_style(), icon, small_icon);
+  ClassInfo class_info(initial_class_style(), icon);
   return ClassRegistrar::GetInstance()->RetrieveClassAtom(class_info);
 }