Remove unnecessary checks and fix shader_bench.

Fixes various issues found via static analysis (see bug).  Also
fixes shader_bench so that it actually works...

BUG=271530
TEST=compiles, media_unittests, content_unittests

Review URL: https://chromiumcodereview.appspot.com/22979002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217448 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 9 insertions, 21 deletions

diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc
index 44f4445..597c645 100644
--- a/content/renderer/media/peer_connection_tracker.cc
+++ b/content/renderer/media/peer_connection_tracker.cc
@@ -161,15 +161,9 @@ static base::DictionaryValue* GetDictValueStats(
     return NULL;
 
   DictionaryValue* dict = new base::DictionaryValue();
-  if (!dict)
-    return NULL;
   dict->SetDouble("timestamp", report.timestamp);
 
   base::ListValue* values = new base::ListValue();
-  if (!values) {
-    delete dict;
-    return NULL;
-  }
   dict->Set("values", values);
 
   for (size_t i = 0; i < report.values.size(); ++i) {
@@ -189,14 +183,10 @@ static base::DictionaryValue* GetDictValue(const webrtc::StatsReport& report) {
     return NULL;
 
   result.reset(new base::DictionaryValue());
-  if (!result)
-    return NULL;
-
   // Note:
   // The format must be consistent with what webrtc_internals.js expects.
   // If you change it here, you must change webrtc_internals.js as well.
-  if (stats)
-    result->Set("stats", stats.release());
+  result->Set("stats", stats.release());
   result->SetString("id", report.id);
   result->SetString("type", report.type);
 
diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc
index b26733c..0b4236f 100644
--- a/media/tools/shader_bench/shader_bench.cc
+++ b/media/tools/shader_bench/shader_bench.cc
@@ -13,6 +13,7 @@
 #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"
@@ -127,18 +128,19 @@ int main(int argc, char** argv) {
 
   // 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[] = {
diff --git a/media/video/capture/win/filter_base_win.cc b/media/video/capture/win/filter_base_win.cc
index 89309df..ddc68d6 100644
--- a/media/video/capture/win/filter_base_win.cc
+++ b/media/video/capture/win/filter_base_win.cc
@@ -72,8 +72,6 @@ class PinEnumerator
 
   STDMETHOD(Clone)(IEnumPins** clone) {
     PinEnumerator* pin_enum = new PinEnumerator(filter_);
-    if (!pin_enum)
-      return E_OUTOFMEMORY;
     pin_enum->AddRef();
     pin_enum->index_ = index_;
     *clone = pin_enum;
diff --git a/media/video/capture/win/pin_base_win.cc b/media/video/capture/win/pin_base_win.cc
index 7e2f7b0..e912b84 100644
--- a/media/video/capture/win/pin_base_win.cc
+++ b/media/video/capture/win/pin_base_win.cc
@@ -93,8 +93,6 @@ class TypeEnumerator
 
   STDMETHOD(Clone)(IEnumMediaTypes** clone) {
     TypeEnumerator* type_enum = new TypeEnumerator(pin_);
-    if (!type_enum)
-      return E_OUTOFMEMORY;
     type_enum->AddRef();
     type_enum->index_ = index_;
     *clone = type_enum;