Revert "Patch to prevent chromium breakage until the DEPS."

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 82afef0a167bce36446f8aa21a02210c62dc1d3e..aea8fc726d4b1359de271e5aff6626e38872f89b 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -189,21 +189,6 @@ public:
      */
     void serialize(SkWStream*, EncodeBitmap encoder = NULL) const;
 
-    /**
-     *  @Deprecated
-     *  Old version of EncodeBitmap, here to prevent chrome tree from going
-     *  red. Will be removed once chrome is switched to the new version.
-     */
-    typedef bool (*OldEncodeBitmap)(SkWStream*, const SkBitmap&);
-
-    /**
-     *  @Deprecated
-     *  Old version of serialize, taking the old version of EncodeBitmap,
-     *  to keep the chrome build green. Will be removed once chrome is
-     *  switched to the new version.
-     */
-    void serialize(SkWStream*, OldEncodeBitmap) const;
-
 #ifdef SK_BUILD_FOR_ANDROID
     /** Signals that the caller is prematurely done replaying the drawing
         commands. This can be called from a canvas virtual while the picture