The great shader refactor: Finish merging YUV shaders

cc/output/gl_renderer_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/output/gl_renderer.h"
 
 #include <stdint.h>
 
 #include <set>
 #include <vector>
@@ skipping 171 matching lines @@
         ProgramKey::Tile(precision, sampler, USE_AA, DO_SWIZZLE, false)));
     EXPECT_PROGRAM_VALID(renderer()->GetProgram(
         ProgramKey::Tile(precision, sampler, NO_AA, NO_SWIZZLE, true)));
     EXPECT_PROGRAM_VALID(renderer()->GetProgram(
         ProgramKey::Tile(precision, sampler, NO_AA, DO_SWIZZLE, true)));
 
     // Iterate over alpha plane, nv12, and color_lut parameters.
     UVTextureMode uv_modes[2] = {UV_TEXTURE_MODE_UV, UV_TEXTURE_MODE_U_V};
     YUVAlphaTextureMode a_modes[2] = {YUV_NO_ALPHA_TEXTURE,
                                       YUV_HAS_ALPHA_TEXTURE};
-    ColorConversionMode c_modes[2] = {
-        COLOR_CONVERSION_MODE_NONE,
-        COLOR_CONVERSION_MODE_2D_LUT_AS_3D_FROM_YUV};
+    ColorConversionMode c_modes[2] = {COLOR_CONVERSION_MODE_NONE,
+                                      COLOR_CONVERSION_MODE_LUT_FROM_YUV};
     for (int j = 0; j < 2; j++) {
       for (int k = 0; k < 2; k++) {
         for (int l = 0; l < 2; l++) {
           const Program* program = renderer()->GetProgram(ProgramKey::YUVVideo(
               precision, sampler, a_modes[j], uv_modes[k], c_modes[l]));
           EXPECT_PROGRAM_VALID(program);
         }
       }
     }
   }
@@ skipping 1777 matching lines @@
   renderer_->SetVisible(true);
   Mock::VerifyAndClearExpectations(context_support_ptr_);
 
   EXPECT_CALL(*context_support_ptr_, SetAggressivelyFreeResources(true));
   renderer_->SetVisible(false);
   Mock::VerifyAndClearExpectations(context_support_ptr_);
 }
 
 }  // namespace
 }  // namespace cc