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

content/browser/renderer_host/media/media_stream_manager.cc

 // Copyright (c) 2011 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/browser/renderer_host/media/media_stream_manager.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 31 matching lines @@
                       MediaStreamType stream_type) {
   if (stream_type == kVideoCapture &&
       (options.video_option != StreamOptions::kNoCamera)) {
     return true;
   } else if (stream_type == kAudioCapture && options.audio == true) {
     return true;
   }
   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)

[scherkus (not reviewing), 2011/11/11 01:44:43]

nit: I'd move the args to previous line then align request_options at next line

[wjia(left Chromium), 2011/11/11 01:51:00]

Done.

+      : 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))),
       enumeration_in_progress_(kNumMediaStreamTypes, false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 MediaStreamManager::~MediaStreamManager() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
@@ skipping 344 matching lines @@
     MediaStreamType stream_type) {
   if (stream_type == kVideoCapture) {
     return video_capture_manager();
   } else if (stream_type == kAudioCapture) {
     return audio_input_device_manager();
   }
   NOTREACHED();
   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