Update stable to r5056.

git-svn-id: http://webrtc.googlecode.com/svn/stable/talk@5057 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/base/move.h b/base/move.h
index 0cd1dcf..a04b7c8 100644
--- a/base/move.h
+++ b/base/move.h
@@ -26,7 +26,7 @@
 //
 //  template <typename T>
 //  class scoped_ptr {
-//     MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
+//     TALK_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
 //   public:
 //    scoped_ptr(RValue& other) : ptr_(other.release()) { }
 //    scoped_ptr& operator=(RValue& other) {
@@ -88,7 +88,7 @@
 // Here's an example with comments explaining what gets triggered where:
 //
 //    class Foo {
-//      MOVE_ONLY_TYPE_FOR_CPP_03(Foo, RValue);
+//      TALK_MOVE_ONLY_TYPE_FOR_CPP_03(Foo, RValue);
 //
 //     public:
 //       ... API ...
@@ -191,7 +191,7 @@
 //
 // The workaround is to explicitly declare your copy constructor.
 //
-#define MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type) \
+#define TALK_MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type) \
  private: \
   struct rvalue_type { \
     explicit rvalue_type(type* object) : object(object) {} \
diff --git a/base/scoped_ptr.h b/base/scoped_ptr.h
index c12948b..90f743c 100644
--- a/base/scoped_ptr.h
+++ b/base/scoped_ptr.h
@@ -95,7 +95,7 @@
 
 #include "talk/base/common.h"  // for ASSERT
 #include "talk/base/compile_assert.h"  // for COMPILE_ASSERT
-#include "talk/base/move.h"    // for MOVE_ONLY_TYPE_FOR_CPP_03
+#include "talk/base/move.h"    // for TALK_MOVE_ONLY_TYPE_FOR_CPP_03
 #include "talk/base/template_util.h"    // for is_convertible, is_array
 
 #ifdef _WIN32
@@ -304,7 +304,7 @@
 // types.
 template <class T, class D = talk_base::DefaultDeleter<T> >
 class scoped_ptr {
-  MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
+  TALK_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
 
  public:
   // The element and deleter types.
@@ -449,7 +449,7 @@
 
 template <class T, class D>
 class scoped_ptr<T[], D> {
-  MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
+  TALK_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
 
  public:
   // The element and deleter types.
@@ -587,12 +587,4 @@
   return p1 != p2.get();
 }
 
-// A function to convert T* into talk_base::scoped_ptr<T>
-// Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
-// for talk_base::scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
-template <typename T>
-talk_base::scoped_ptr<T> make_scoped_ptr(T* ptr) {
-  return talk_base::scoped_ptr<T>(ptr);
-}
-
 #endif  // #ifndef TALK_BASE_SCOPED_PTR_H__
diff --git a/media/base/capturemanager.h b/media/base/capturemanager.h
index 9c44395..5226e7b 100644
--- a/media/base/capturemanager.h
+++ b/media/base/capturemanager.h
@@ -67,19 +67,19 @@
   CaptureManager() {}
   virtual ~CaptureManager();
 
-  bool StartVideoCapture(VideoCapturer* video_capturer,
-                         const VideoFormat& desired_format);
-  bool StopVideoCapture(VideoCapturer* video_capturer,
-                        const VideoFormat& format);
+  virtual bool StartVideoCapture(VideoCapturer* video_capturer,
+                                 const VideoFormat& desired_format);
+  virtual bool StopVideoCapture(VideoCapturer* video_capturer,
+                                const VideoFormat& format);
 
   // Possibly restarts the capturer. If |options| is set to kRequestRestart,
   // the CaptureManager chooses whether this request can be handled with the
   // current state or if a restart is actually needed. If |options| is set to
   // kForceRestart, the capturer is restarted.
-  bool RestartVideoCapture(VideoCapturer* video_capturer,
-                           const VideoFormat& previous_format,
-                           const VideoFormat& desired_format,
-                           RestartOptions options);
+  virtual bool RestartVideoCapture(VideoCapturer* video_capturer,
+                                   const VideoFormat& previous_format,
+                                   const VideoFormat& desired_format,
+                                   RestartOptions options);
 
   virtual bool AddVideoRenderer(VideoCapturer* video_capturer,
                                 VideoRenderer* video_renderer);