move EventHandler out of VideoCaptureController to make VS2005 happy

content/browser/renderer_host/video_capture_host.cc

Index: content/browser/renderer_host/video_capture_host.cc
===================================================================
--- content/browser/renderer_host/video_capture_host.cc	(revision 87318)
+++ content/browser/renderer_host/video_capture_host.cc	(working copy)
@@ -31,8 +31,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Implements VideoCaptureController::EventHandler.
-void VideoCaptureHost::OnError(VideoCaptureController::ControllerId id) {
+// Implements VideoCaptureControllerEventHandler.
+void VideoCaptureHost::OnError(VideoCaptureControllerId id) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &VideoCaptureHost::DoHandleError, id.first,
@@ -40,7 +40,7 @@
 }
 
 void VideoCaptureHost::OnBufferReady(
-    VideoCaptureController::ControllerId id,
+    VideoCaptureControllerId id,
     TransportDIB::Handle handle,
     base::Time timestamp) {
   BrowserThread::PostTask(
@@ -49,7 +49,7 @@
                         id.second, handle, timestamp));
 }
 
-void VideoCaptureHost::OnFrameInfo(VideoCaptureController::ControllerId id,
+void VideoCaptureHost::OnFrameInfo(VideoCaptureControllerId id,
                                    int width,
                                    int height,
                                    int frame_per_second) {
@@ -60,7 +60,7 @@
 }
 
 void VideoCaptureHost::OnReadyToDelete(
-    VideoCaptureController::ControllerId id) {
+    VideoCaptureControllerId id) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &VideoCaptureHost::DoDeleteVideoCaptureController,
@@ -83,7 +83,7 @@
   Send(new VideoCaptureMsg_StateChanged(routing_id, device_id,
                                         media::VideoCapture::kError));
 
-  VideoCaptureController::ControllerId id(routing_id, device_id);
+  VideoCaptureControllerId id(routing_id, device_id);
   EntryMap::iterator it = entries_.find(id);
   if (it != entries_.end()) {
     VideoCaptureController* controller = it->second;
@@ -127,8 +127,7 @@
                                       const media::VideoCaptureParams& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  VideoCaptureController::ControllerId controller_id(msg.routing_id(),
-                                                     device_id);
+  VideoCaptureControllerId controller_id(msg.routing_id(), device_id);
 
   DCHECK(entries_.find(controller_id) == entries_.end());
 
@@ -141,8 +140,7 @@
 void VideoCaptureHost::OnStopCapture(const IPC::Message& msg, int device_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  VideoCaptureController::ControllerId controller_id(msg.routing_id(),
-                                                     device_id);
+  VideoCaptureControllerId controller_id(msg.routing_id(), device_id);
   EntryMap::iterator it = entries_.find(controller_id);
   if (it != entries_.end()) {
     scoped_refptr<VideoCaptureController> controller = it->second;
@@ -166,8 +164,7 @@
                                             TransportDIB::Handle handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  VideoCaptureController::ControllerId controller_id(msg.routing_id(),
-                                                     device_id);
+  VideoCaptureControllerId controller_id(msg.routing_id(), device_id);
   EntryMap::iterator it = entries_.find(controller_id);
   if (it != entries_.end()) {
     scoped_refptr<VideoCaptureController> controller = it->second;
@@ -176,7 +173,7 @@
 }
 
 void VideoCaptureHost::DoDeleteVideoCaptureController(
-    VideoCaptureController::ControllerId id) {
+    VideoCaptureControllerId id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Report that the device have successfully been stopped.