Revert of Enabling ico decoding with use of png and bmp decoders

src/codec/SkCodec_libbmp.h

Index: src/codec/SkCodec_libbmp.h
diff --git a/src/codec/SkCodec_libbmp.h b/src/codec/SkCodec_libbmp.h
index 4dda117d5a1e6529d4504bdfdb693997d7259984..fb23716f77a1d0ad2ff44462c24246b186771756 100644
--- a/src/codec/SkCodec_libbmp.h
+++ b/src/codec/SkCodec_libbmp.h
@@ -7,6 +7,7 @@
 
 #include "SkCodec.h"
 #include "SkColorTable.h"
+#include "SkEncodedFormat.h"
 #include "SkImageInfo.h"
 #include "SkMaskSwizzler.h"
 #include "SkStream.h"
@@ -35,7 +36,7 @@
 
     /*
      *
-     * Checks the start of the stream to see if the image is a bmp
+     * Checks the start of the stream to see if the image is a bitmap
      *
      */
     static bool IsBmp(SkStream*);
@@ -43,25 +44,17 @@
     /*
      *
      * Assumes IsBmp was called and returned true
-     * Creates a bmp decoder
+     * Creates a bitmap decoder
      * Reads enough of the stream to determine the image format
      *
      */
     static SkCodec* NewFromStream(SkStream*);
 
-    /*
-     *
-     * Creates a bmp decoder for a bmp embedded in ico
-     * Reads enough of the stream to determine the image format
-     *
-     */
-    static SkCodec* NewFromIco(SkStream*);
-
 protected:
 
     /*
      *
-     * Initiates the bmp decode
+     * Initiates the bitmap decode
      *
      */
     virtual Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
@@ -69,12 +62,11 @@
                                int*) SK_OVERRIDE;
 
     SkEncodedFormat onGetEncodedFormat() const SK_OVERRIDE { return kBMP_SkEncodedFormat; }
-
 private:
 
     /*
      *
-     * Used to define the input format of the bmp
+     * Used to define the input format of the bitmap
      *
      */
     enum BitmapInputFormat {
@@ -90,14 +82,6 @@
      *
      */
      bool createColorTable(SkAlphaType alphaType);
-
-    /*
-     *
-     * Creates a bmp decoder
-     * Reads enough of the stream to determine the image format
-     *
-     */
-    static SkCodec* NewFromStream(SkStream*, bool isIco);
 
     /*
      *
@@ -165,8 +149,7 @@
     SkBmpCodec(const SkImageInfo& srcInfo, SkStream* stream,
                uint16_t bitsPerPixel, BitmapInputFormat format,
                SkMasks* masks, uint32_t numColors, uint32_t bytesPerColor,
-               uint32_t offset, RowOrder rowOrder, size_t RLEBytes,
-               bool isIco);
+               uint32_t offset, RowOrder rowOrder, size_t RLEByes);
 
     // Fields
     const uint16_t                      fBitsPerPixel;
@@ -178,7 +161,6 @@
     const uint32_t                      fOffset;
     const RowOrder                      fRowOrder;
     const size_t                        fRLEBytes;
-    const bool                          fIsIco;
 
     typedef SkCodec INHERITED;
 };