Use the static CRT.

build/common.gypi

@@ -106,7 +106,10 @@
                     {
                         'Optimization': '0',    # /Od
                         'BasicRuntimeChecks': '3',
-                        'RuntimeLibrary': '3',  # /MDd (Debug Multithreaded DLL)
+
+                        # Use the static C runtime to match chromium and make sure we don't depend on
+                        # the dynamic runtime's shared heaps
+                        'RuntimeLibrary': '1',  # /MTd (debug static)
                     },
                     'VCLinkerTool':
                     {
@@ -143,7 +146,10 @@
                     'VCCLCompilerTool':
                     {
                         'Optimization': '2',    # /Os
-                        'RuntimeLibrary': '2',  # /MD (Multithreaded DLL)
+
+                        # Use the static C runtime to match chromium and make sure we don't depend on
+                        # the dynamic runtime's shared heaps
+                        'RuntimeLibrary': '0', #  /MT (nondebug static)
                     },
                     'VCLinkerTool':
                     {

tests/angle_tests/GLSLTest.cpp

@@ -821,13 +821,3 @@ TYPED_TEST(GLSLTest, ZeroShaderLength)
     glGetShaderiv(shader, GL_COMPILE_STATUS, &compileResult);
     EXPECT_NE(compileResult, 0);
 }
-
-// Verify that a length value much larger than the source length will crash.
-TYPED_TEST(GLSLTest, InvalidShaderLength)
-{
-    GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
-
-    const char *sourceArray[1] = { "" };
-    GLint lengths[1] = { std::numeric_limits<GLint>::max() };
-    EXPECT_ANY_THROW(glShaderSource(shader, ArraySize(sourceArray), sourceArray, lengths));
-}