switch to DVLOG from VLOG, and move struct definition to cc file.

Clean up the code a bit.
BUG=none
TEST=trybots

Review URL: http://codereview.chromium.org/8525018

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

3 files changed, 31 insertions, 33 deletions

diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc
index aca4423..12263f5 100644
--- a/content/renderer/media/media_stream_dispatcher.cc
+++ b/content/renderer/media/media_stream_dispatcher.cc
@@ -9,6 +9,27 @@
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
 #include "content/renderer/render_view_impl.h"
 
+struct MediaStreamDispatcher::Request {
+  Request(MediaStreamDispatcherEventHandler* handler,
+          int request_id,
+          int ipc_request)
+      : handler(handler),
+        request_id(request_id),
+        ipc_request(ipc_request) {
+  }
+  MediaStreamDispatcherEventHandler* handler;
+  int request_id;
+  int ipc_request;
+};
+
+struct MediaStreamDispatcher::Stream {
+  Stream() : handler(NULL) {}
+  ~Stream() {}
+  MediaStreamDispatcherEventHandler* handler;
+  media_stream::StreamDeviceInfoArray audio_array;
+  media_stream::StreamDeviceInfoArray video_array;
+};
+
 MediaStreamDispatcherEventHandler::~MediaStreamDispatcherEventHandler() {}
 
 MediaStreamDispatcher::MediaStreamDispatcher(RenderViewImpl* render_view)
@@ -23,7 +44,7 @@ void MediaStreamDispatcher::GenerateStream(
     MediaStreamDispatcherEventHandler* event_handler,
     media_stream::StreamOptions components,
     const std::string& security_origin) {
-  VLOG(1) << "MediaStreamDispatcher::GenerateStream(" << request_id << ")";
+  DVLOG(1) << "MediaStreamDispatcher::GenerateStream(" << request_id << ")";
 
   requests_.push_back(Request(event_handler, request_id, next_ipc_id_));
   Send(new MediaStreamHostMsg_GenerateStream(routing_id(),
@@ -33,8 +54,8 @@ void MediaStreamDispatcher::GenerateStream(
 }
 
 void MediaStreamDispatcher::StopStream(const std::string& label) {
-  VLOG(1) << "MediaStreamDispatcher::StopStream"
-          << ", {label = " << label << "}";
+  DVLOG(1) << "MediaStreamDispatcher::StopStream"
+           << ", {label = " << label << "}";
 
   LabelStreamMap::iterator it = label_stream_map_.find(label);
   if (it == label_stream_map_.end())
@@ -77,8 +98,8 @@ void MediaStreamDispatcher::OnStreamGenerated(
       label_stream_map_[label] = new_stream;
       request.handler->OnStreamGenerated(request.request_id, label,
                                          audio_array, video_array);
-      VLOG(1) << "MediaStreamDispatcher::OnStreamGenerated("
-              << request.request_id << ", " << label << ")";
+      DVLOG(1) << "MediaStreamDispatcher::OnStreamGenerated("
+               << request.request_id << ", " << label << ")";
       requests_.erase(it);
       break;
     }
@@ -91,8 +112,8 @@ void MediaStreamDispatcher::OnStreamGenerationFailed(int request_id) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
       request.handler->OnStreamGenerationFailed(request.request_id);
-      VLOG(1) << "MediaStreamDispatcher::OnStreamGenerationFailed("
-              << request.request_id << ")\n";
+      DVLOG(1) << "MediaStreamDispatcher::OnStreamGenerationFailed("
+               << request.request_id << ")\n";
       requests_.erase(it);
       break;
     }
@@ -150,9 +171,3 @@ int MediaStreamDispatcher::video_session_id(const std::string& label,
   DCHECK_GT(it->second.video_array.size(), static_cast<size_t>(index));
   return it->second.video_array[index].session_id;
 }
-
-MediaStreamDispatcher::Stream::Stream()
-    : handler(NULL) {}
-
-MediaStreamDispatcher::Stream::~Stream() {}
-
diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h
index cbbe160..c91cf7e 100644
--- a/content/renderer/media/media_stream_dispatcher.h
+++ b/content/renderer/media/media_stream_dispatcher.h
@@ -52,28 +52,11 @@ class CONTENT_EXPORT MediaStreamDispatcher
   FRIEND_TEST_ALL_PREFIXES(MediaStreamDispatcherTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(MediaStreamDispatcherTest, TestFailure);
 
-  struct Request {
-    Request(MediaStreamDispatcherEventHandler* handler,
-            int request_id,
-            int ipc_request)
-        : handler(handler),
-          request_id(request_id),
-          ipc_request(ipc_request) {
-    }
-    MediaStreamDispatcherEventHandler* handler;
-    int request_id;
-    int ipc_request;
-  };
+  struct Request;
 
   // Private class for keeping track of opened devices and who have
   // opened it.
-  struct Stream {
-    Stream();
-    ~Stream();
-    MediaStreamDispatcherEventHandler* handler;
-    media_stream::StreamDeviceInfoArray audio_array;
-    media_stream::StreamDeviceInfoArray video_array;
-  };
+  struct Stream;
 
   // Messages from the browser.
   virtual bool OnMessageReceived(const IPC::Message& message);
diff --git a/content/renderer/media/video_capture_message_filter.cc b/content/renderer/media/video_capture_message_filter.cc
index f4c4b15..08adfaa 100644
--- a/content/renderer/media/video_capture_message_filter.cc
+++ b/content/renderer/media/video_capture_message_filter.cc
@@ -37,7 +37,7 @@ bool VideoCaptureMessageFilter::OnMessageReceived(const IPC::Message& message) {
 }
 
 void VideoCaptureMessageFilter::OnFilterAdded(IPC::Channel* channel) {
-  VLOG(1) << "VideoCaptureMessageFilter::OnFilterAdded()";
+  DVLOG(1) << "VideoCaptureMessageFilter::OnFilterAdded()";
   // Captures the message loop proxy for IPC.
   message_loop_proxy_ = base::MessageLoopProxy::current();
   channel_ = channel;