Revert "Revert of Workaround for assertion in NVPR config in bench. (https://codereview.chromium.org

gyp/bench.gyp

 # GYP file to build performance testbench.
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       'target_name': 'bench',
       'type': 'executable',
@@ skipping 87 matching lines @@
         '../bench/SkBenchmark.cpp',
         '../bench/SkBenchmark.h',
         '../bench/benchmain.cpp',
       ],
       'conditions': [
         ['skia_gpu == 1',
           {
             'include_dirs' : [
               '../src/gpu',
             ],
+            'dependencies': [
+              'gputest.gyp:skgputest',
+            ],
           },
         ],
       ],
     },
     {
       'target_name' : 'bench_timer',
       'type': 'static_library',
       'sources': [
         '../bench/BenchTimer.h',
         '../bench/BenchTimer.cpp',
@@ skipping 40 matching lines @@
         ['skia_gpu == 1', {
           'sources': [
             '../bench/BenchGpuTimer_gl.h',
             '../bench/BenchGpuTimer_gl.cpp',
           ],
         }],
       ],
     }
   ],
 }