Remove unnecessary checks and fix shader_bench.

content/renderer/media/peer_connection_tracker.cc

 // Copyright (c) 2013 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 "content/renderer/media/peer_connection_tracker.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/media/peer_connection_tracker_messages.h"
 #include "content/renderer/media/rtc_media_constraints.h"
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 #include "content/renderer/render_thread_impl.h"
@@ skipping 143 matching lines @@
 // The caller takes the ownership of the returned value.
 // 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.
 static base::DictionaryValue* GetDictValueStats(
     const webrtc::StatsReport& report) {
   if (report.values.empty())
     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) {
     values->AppendString(report.values[i].name);
     values->AppendString(report.values[i].value);
   }
   return dict;
 }
 
 // Builds a DictionaryValue from the StatsReport.
 // The caller takes the ownership of the returned value.
 static base::DictionaryValue* GetDictValue(const webrtc::StatsReport& report) {
   scoped_ptr<base::DictionaryValue> stats, result;
 
   stats.reset(GetDictValueStats(report));
   if (!stats)
     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);
 
   return result.release();
 }
 
 class InternalStatsObserver : public webrtc::StatsObserver {
  public:
   InternalStatsObserver(int lid)
       : lid_(lid){}
@@ skipping 244 matching lines @@
     const std::string& value) {
   if (peer_connection_id_map_.find(pc_handler) == peer_connection_id_map_.end())
     return;
 
   RenderThreadImpl::current()->Send(
       new PeerConnectionTrackerHost_UpdatePeerConnection(
           peer_connection_id_map_[pc_handler], type, value));
 }
 
 }  // namespace content