Revert of Replace GrStrokeInfo with GrStyle.

tests/GpuDrawPathTest.cpp

Index: tests/GpuDrawPathTest.cpp
diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp
index dc8db0ff70f09b12720d97e206ff8264986c8440..2dc7702fffa7d0fcf808cab55c2889afa52885b3 100644
--- a/tests/GpuDrawPathTest.cpp
+++ b/tests/GpuDrawPathTest.cpp
@@ -11,7 +11,7 @@
 
 #include "GrContext.h"
 #include "GrPath.h"
-#include "GrStyle.h"
+#include "GrStrokeInfo.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
@@ -104,8 +104,9 @@
 
     bool isVolatile;
     GrUniqueKey key1, key2;
-    GrPath::ComputeKey(path1, GrStyle::SimpleFill(), &key1, &isVolatile);
-    GrPath::ComputeKey(path2, GrStyle::SimpleFill(), &key2, &isVolatile);
+    GrStrokeInfo stroke(SkStrokeRec::kFill_InitStyle);
+    GrPath::ComputeKey(path1, stroke, &key1, &isVolatile);
+    GrPath::ComputeKey(path2, stroke, &key2, &isVolatile);
     REPORTER_ASSERT(reporter, key1 != key2);
 }