Revert of Fix Chromium build (patchset #2 id:20001 of https://codereview.chromium.org/916763003/)

Reason for revert:
Chrome

Original issue's description:
> Fix Chromium build
>
> TBR=jvanverth@google.com
>
> Committed: https://skia.googlesource.com/skia/+/f5e89c8f685ac8a5c4d117e087b4111d613106db

TBR=jvanverth@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/916963002

debugger/QT/SkDebuggerGUI.cpp

@@ -7,6 +7,9 @@
 
 #include "SkDebuggerGUI.h"
 #include "PictureRenderer.h"
+#include "SkPictureData.h"
+#include "SkPicturePlayback.h"
+#include "SkPictureRecord.h"
 #include <QListWidgetItem>
 #include <QtGui>
 

src/utils/debugger/SkDrawCommand.h

@@ -72,8 +72,6 @@ private:
     bool   fVisible;
 };
 
-typedef SkDrawCommand::OpType DrawType;
-
 class SkRestoreCommand : public SkDrawCommand {
 public:
     SkRestoreCommand();

tests/MatrixClipCollapseTest.cpp

@@ -6,9 +6,6 @@
  */
 
 #include "Test.h"
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-
 #include "SkCanvas.h"
 #include "SkDebugCanvas.h"
 #include "SkPicture.h"
@@ -55,6 +52,7 @@
 //        system is ready for prime time
 //   bench the recording times with/without matrix/clip collapsing
 
+#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
 
 // Enable/disable debugging helper code
 //#define TEST_COLLAPSE_MATRIX_CLIP_STATE 1

tools/filtermain.cpp

@@ -13,6 +13,7 @@
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
+#include "SkPictureRecord.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
 #include "picture_utils.h"