Revert of Replace GrStrokeInfo with GrStyle.

tests/GpuDrawPathTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 
 #if SK_SUPPORT_GPU
 
 #include "GrContext.h"
 #include "GrPath.h"
-#include "GrStyle.h"
+#include "GrStrokeInfo.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkDashPathEffect.h"
 #include "SkRRect.h"
 #include "SkRect.h"
 #include "SkSurface.h"
 #include "Test.h"
@@ skipping 72 matching lines @@
     path1.setIsVolatile(true);
     path2.setIsVolatile(true);
     SkPoint p0 = SkPoint::Make(100, 0);
     SkPoint p1 = SkPoint::Make(100, 100);
 
     path1.conicTo(p0, p1, .5f);
     path2.conicTo(p0, p1, .7f);
 
     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);
 }
 
 #endif