Remove unnecessary checks and fix shader_bench.

media/tools/shader_bench/shader_bench.cc

 // Copyright (c) 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 <stdio.h>
 #include <stdlib.h>
 #include <deque>
 #include <ostream>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
+#include "media/base/media.h"
 #include "media/base/video_frame.h"
 #include "media/tools/shader_bench/cpu_color_painter.h"
 #include "media/tools/shader_bench/gpu_color_painter.h"
 #include "media/tools/shader_bench/painter.h"
 #include "media/tools/shader_bench/window.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
@@ skipping 94 matching lines @@
       dimensions.substr(x_index + 1, dimensions.length() - x_index - 1);
   base::StringToInt(str_width, &width);
   base::StringToInt(str_height, &height);
 
   // Process files.
   std::deque<scoped_refptr<media::VideoFrame> > frames;
   GetFrames(file_name, width, height, num_frames, frames);
 
   // Initialize window and graphics context.
   base::AtExitManager at_exit_manager;
+  media::InitializeMediaLibraryForTesting();
   gfx::GLSurface::InitializeOneOff();
   scoped_ptr<media::Window> window(new media::Window(width, height));
-  gfx::GLSurface* surface =
-      gfx::GLSurface::CreateViewGLSurface(window->PluginWindow()).get();
-  gfx::GLContext* context = gfx::GLContext::CreateGLContext(
-      NULL, surface, gfx::PreferDiscreteGpu).get();
-  context->MakeCurrent(surface);
+  scoped_refptr<gfx::GLSurface> surface =
+      gfx::GLSurface::CreateViewGLSurface(window->PluginWindow());
+  scoped_refptr<gfx::GLContext> context = gfx::GLContext::CreateGLContext(
+      NULL, surface.get(), gfx::PreferDiscreteGpu);
+  context->MakeCurrent(surface.get());
   // This sets D3DPRESENT_INTERVAL_IMMEDIATE on Windows.
   context->SetSwapInterval(0);
 
   // Initialize and name GPU painters.
-  static const struct {
+  const struct {
     const char* name;
     GPUPainter* painter;
   } painters[] = {
     { "CPU CSC + GPU Render", new CPUColorPainter() },
     { "GPU CSC/Render", new GPUColorWithLuminancePainter() },
   };
 
   // Run GPU painter tests.
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(painters); i++) {
     scoped_ptr<GPUPainter> painter(painters[i].painter);
     painter->LoadFrames(&frames);
     painter->SetGLContext(surface, context);
     painter->Initialize(width, height);
     printf("Running %s tests...", painters[i].name);
     RunTest(window.get(), painter.get());
   }
 
   return 0;
 }