Revert "Return variable type queries using GLenum values."

Breaks the FYI bots until we get Chromium patched.

BUG=angle:466

This reverts commit 53221f5a0382887155d90f7f286e41190d4f5bfb.

Change-Id: Ib28548df5c10a6f76f46e4cf8f2013dca5cf0ee2
Reviewed-on: https://chromium-review.googlesource.com/205850
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/compiler/translator/VariablePacker.h b/src/compiler/translator/VariablePacker.h
index d66b0fc..2a92321 100644
--- a/src/compiler/translator/VariablePacker.h
+++ b/src/compiler/translator/VariablePacker.h
@@ -19,10 +19,10 @@
         const TVariableInfoList& in_variables);
 
     // Gets how many components in a row a data type takes.
-    static int GetNumComponentsPerRow(sh::GLenum type);
+    static int GetNumComponentsPerRow(ShDataType type);
 
     // Gets how many rows a data type takes.
-    static int GetNumRows(sh::GLenum type);
+    static int GetNumRows(ShDataType type);
 
  private:
     static const int kNumColumns = 4;