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

7 files changed, 98 insertions, 102 deletions

diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
index d387a70..b978df8 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -12,6 +12,17 @@ using content::BrowserThread;
 
 namespace media_stream {
 
+struct MediaStreamDispatcherHost::StreamRequest {
+  StreamRequest() {}
+  StreamRequest(int render_view_id, int page_request_id)
+      : render_view_id(render_view_id),
+        page_request_id(page_request_id ) {
+  }
+  int render_view_id;
+  // Id of the request generated by MediaStreamDispatcher.
+  int page_request_id;
+};
+
 MediaStreamDispatcherHost::MediaStreamDispatcherHost(
     const content::ResourceContext* resource_context, int render_process_id)
     : resource_context_(resource_context),
@@ -39,7 +50,7 @@ bool MediaStreamDispatcherHost::OnMessageReceived(
 
 void MediaStreamDispatcherHost::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
-  VLOG(1) << "MediaStreamDispatcherHost::OnChannelClosing";
+  DVLOG(1) << "MediaStreamDispatcherHost::OnChannelClosing";
 
   // TODO(mflodman) Remove this temporary solution when shut-down issue is
   // resolved, i.e. uncomment the code below.
@@ -59,18 +70,18 @@ void MediaStreamDispatcherHost::OnGenerateStream(
     int page_request_id,
     const media_stream::StreamOptions& components,
     const std::string& security_origin) {
-  VLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
-          << render_view_id << ", "
-          << page_request_id << ", [ "
-          << (components.audio ? "audio " : "")
-          << ((components.video_option &
-              StreamOptions::kFacingUser) ?
-              "video_facing_user " : "")
-          << ((components.video_option &
-               StreamOptions::kFacingEnvironment) ?
-              "video_facing_environment " : "")
-          << "], "
-          << security_origin << ")";
+  DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
+           << render_view_id << ", "
+           << page_request_id << ", [ "
+           << (components.audio ? "audio " : "")
+           << ((components.video_option &
+               StreamOptions::kFacingUser) ?
+               "video_facing_user " : "")
+           << ((components.video_option &
+                StreamOptions::kFacingEnvironment) ?
+               "video_facing_environment " : "")
+           << "], "
+           << security_origin << ")";
 
   std::string label;
   manager()->GenerateStream(this, render_process_id_, render_view_id,
@@ -81,8 +92,8 @@ void MediaStreamDispatcherHost::OnGenerateStream(
 
 void MediaStreamDispatcherHost::OnStopGeneratedStream(
     int render_view_id, const std::string& label) {
-  VLOG(1) << "MediaStreamDispatcherHost::OnStopGeneratedStream("
-          << ", {label = " << label <<  "})";
+  DVLOG(1) << "MediaStreamDispatcherHost::OnStopGeneratedStream("
+           << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
@@ -95,8 +106,8 @@ void MediaStreamDispatcherHost::StreamGenerated(
     const StreamDeviceInfoArray& audio_devices,
     const StreamDeviceInfoArray& video_devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  VLOG(1) << "MediaStreamDispatcherHost::StreamGenerated("
-          << ", {label = " << label <<  "})";
+  DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerated("
+           << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
@@ -110,8 +121,8 @@ void MediaStreamDispatcherHost::StreamGenerated(
 void MediaStreamDispatcherHost::StreamGenerationFailed(
     const std::string& label) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  VLOG(1) << "MediaStreamDispatcherHost::StreamGenerationFailed("
-          << ", {label = " << label <<  "})";
+  DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerationFailed("
+           << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
@@ -125,8 +136,8 @@ void MediaStreamDispatcherHost::StreamGenerationFailed(
 void MediaStreamDispatcherHost::AudioDeviceFailed(const std::string& label,
                                                   int index) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  VLOG(1) << "MediaStreamDispatcherHost::AudioDeviceFailed("
-          << ", {label = " << label <<  "})";
+  DVLOG(1) << "MediaStreamDispatcherHost::AudioDeviceFailed("
+           << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
@@ -139,8 +150,8 @@ void MediaStreamDispatcherHost::AudioDeviceFailed(const std::string& label,
 void MediaStreamDispatcherHost::VideoDeviceFailed(const std::string& label,
                                                   int index) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  VLOG(1) << "MediaStreamDispatcherHost::VideoDeviceFailed("
-          << ", {label = " << label <<  "})";
+  DVLOG(1) << "MediaStreamDispatcherHost::VideoDeviceFailed("
+           << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
index 9397230..cc315ed 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
@@ -63,16 +63,7 @@ class CONTENT_EXPORT MediaStreamDispatcherHost
   const content::ResourceContext* resource_context_;
   int render_process_id_;
 
-  struct StreamRequest {
-    StreamRequest() {}
-    StreamRequest(int render_view_id, int page_request_id)
-        : render_view_id(render_view_id),
-          page_request_id(page_request_id ) {
-    }
-    int render_view_id;
-    // Id of the request generated by MediaStreamDispatcher.
-    int page_request_id;
-  };
+  struct StreamRequest;
   typedef std::map<std::string, StreamRequest> StreamMap;
   // Streams generated for this host.
   StreamMap streams_;
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index ad690d0..d9d8db2 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -49,6 +49,37 @@ static bool Requested(const StreamOptions& options,
   return false;
 }
 
+struct MediaStreamManager::DeviceRequest {
+  DeviceRequest()
+      : requester(NULL),
+        state(kNumMediaStreamTypes, kNotRequested) {
+    options.audio = false;
+    options.video_option = StreamOptions::kNoCamera;
+  }
+  DeviceRequest(MediaStreamRequester* requester,
+                const StreamOptions& request_options)
+      : requester(requester),
+        options(request_options),
+        state(kNumMediaStreamTypes, kNotRequested) {
+    DCHECK(requester);
+  }
+  ~DeviceRequest() {}
+
+  enum RequestState {
+    kNotRequested = 0,
+    kRequested,
+    kOpening,
+    kDone,
+    kError
+  };
+
+  MediaStreamRequester* requester;
+  StreamOptions options;
+  std::vector<RequestState> state;
+  StreamDeviceInfoArray audio_devices;
+  StreamDeviceInfoArray video_devices;
+};
+
 MediaStreamManager::MediaStreamManager()
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           device_settings_(new MediaStreamDeviceSettings(this))),
@@ -413,21 +444,4 @@ MediaStreamProvider* MediaStreamManager::GetDeviceManager(
   return NULL;
 }
 
-MediaStreamManager::DeviceRequest::DeviceRequest()
-    : requester(NULL),
-      state(kNumMediaStreamTypes, kNotRequested) {
-  options.audio = false;
-  options.video_option = StreamOptions::kNoCamera;
-}
-
-MediaStreamManager::DeviceRequest::DeviceRequest(
-    MediaStreamRequester* requester, const StreamOptions& request_options)
-    : requester(requester),
-      options(request_options),
-      state(kNumMediaStreamTypes, kNotRequested) {
-  DCHECK(requester);
-}
-
-MediaStreamManager::DeviceRequest::~DeviceRequest() {}
-
 }  // namespace media_stream
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index a5d74c4..4edc6dd 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -89,25 +89,7 @@ class CONTENT_EXPORT MediaStreamManager
 
  private:
   // Contains all data needed to keep track of requests.
-  struct DeviceRequest {
-    DeviceRequest();
-    DeviceRequest(MediaStreamRequester* requester,
-                  const StreamOptions& request_options);
-    ~DeviceRequest();
-    enum RequestState {
-      kNotRequested = 0,
-      kRequested,
-      kOpening,
-      kDone,
-      kError
-    };
-
-    MediaStreamRequester* requester;
-    StreamOptions options;
-    std::vector<RequestState> state;
-    StreamDeviceInfoArray audio_devices;
-    StreamDeviceInfoArray video_devices;
-  };
+  struct DeviceRequest;
 
   // Helpers.
   bool RequestDone(const MediaStreamManager::DeviceRequest& request) const;
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;