RefCounted types should not have public destructors, content/browser part 2

content/renderer/media/media_stream_impl.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 "content/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 57 matching lines @@
 // returned string is undefined.
 static std::string ExtractManagerStreamLabel(
     const std::string& track_label) {
   std::string manager_label = track_label;
   size_t pos = manager_label.rfind("#");
   // If # isn't found, the string is left intact.
   manager_label = manager_label.substr(0, pos);
   return manager_label;
 }
 
-
-int MediaStreamImpl::next_request_id_ = 0;
+static int g_next_request_id = 0;
 
 MediaStreamImpl::MediaStreamImpl(
     content::RenderView* render_view,
     MediaStreamDispatcher* media_stream_dispatcher,
     content::P2PSocketDispatcher* p2p_socket_dispatcher,
     VideoCaptureImplManager* vc_manager,
     MediaStreamDependencyFactory* dependency_factory)
     : content::RenderViewObserver(render_view),
       dependency_factory_(dependency_factory),
       media_stream_dispatcher_(media_stream_dispatcher),
@@ skipping 84 matching lines @@
 void MediaStreamImpl::requestUserMedia(
     const WebKit::WebUserMediaRequest& user_media_request,
     const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
     const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources) {
   // Save histogram data so we can see how much GetUserMedia is used.
   // The histogram counts the number of calls to the JS API
   // webGetUserMedia.
   UMA_HISTOGRAM_COUNTS_100(kHistogramGetUserMedia, 1);
   DCHECK(CalledOnValidThread());
   DCHECK(!user_media_request.isNull());
-  int request_id = next_request_id_++;
+  int request_id = g_next_request_id++;
 
   bool audio = user_media_request.audio();
   media_stream::StreamOptions::VideoOption video_option =
       media_stream::StreamOptions::kNoCamera;
   if (user_media_request.video())
     video_option = media_stream::StreamOptions::kFacingBoth;
 
   std::string security_origin = UTF16ToUTF8(
       user_media_request.securityOrigin().toString());
 
@@ skipping 325 matching lines @@
   return rtc_video_decoder;
 }
 
 MediaStreamImpl::VideoRendererWrapper::VideoRendererWrapper(
     RTCVideoDecoder* decoder)
     : rtc_video_decoder_(decoder) {
 }
 
 MediaStreamImpl::VideoRendererWrapper::~VideoRendererWrapper() {
 }