Rename WebKit namespace to blink (part 3)

content/renderer/media/media_stream_impl.h

Index: content/renderer/media/media_stream_impl.h
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
index 6005611a77b5c17bd009133186de6b8eb33a6f28..c9737d78c363991fb2659dbb6f4b75e7c4bb64bb 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -42,7 +42,7 @@ class WebRtcLocalAudioRenderer;
 // MediaStreamImpl have weak pointers to a MediaStreamDispatcher.
 class CONTENT_EXPORT MediaStreamImpl
     : public RenderViewObserver,
-      NON_EXPORTED_BASE(public WebKit::WebUserMediaClient),
+      NON_EXPORTED_BASE(public blink::WebUserMediaClient),
       NON_EXPORTED_BASE(public MediaStreamClient),
       public MediaStreamDispatcherEventHandler,
       public base::SupportsWeakPtr<MediaStreamImpl>,
@@ -54,11 +54,11 @@ class CONTENT_EXPORT MediaStreamImpl
       MediaStreamDependencyFactory* dependency_factory);
   virtual ~MediaStreamImpl();
 
-  // WebKit::WebUserMediaClient implementation
+  // blink::WebUserMediaClient implementation
   virtual void requestUserMedia(
-      const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
+      const blink::WebUserMediaRequest& user_media_request) OVERRIDE;
   virtual void cancelUserMediaRequest(
-      const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
+      const blink::WebUserMediaRequest& user_media_request) OVERRIDE;
 
   // MediaStreamClient implementation.
   virtual bool IsMediaStream(const GURL& url) OVERRIDE;
@@ -88,11 +88,11 @@ class CONTENT_EXPORT MediaStreamImpl
   virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
 
   // RenderViewObserver OVERRIDE
-  virtual void FrameDetached(WebKit::WebFrame* frame) OVERRIDE;
-  virtual void FrameWillClose(WebKit::WebFrame* frame) OVERRIDE;
+  virtual void FrameDetached(blink::WebFrame* frame) OVERRIDE;
+  virtual void FrameWillClose(blink::WebFrame* frame) OVERRIDE;
 
  protected:
-  void OnLocalSourceStop(const WebKit::WebMediaStreamSource& source);
+  void OnLocalSourceStop(const blink::WebMediaStreamSource& source);
 
   void OnLocalMediaStreamStop(const std::string& label);
 
@@ -102,28 +102,28 @@ class CONTENT_EXPORT MediaStreamImpl
   // UserMediaRequests::web_stream for which the underlying sources have been
   // created.
   void OnCreateNativeSourcesComplete(
-      WebKit::WebMediaStream* web_stream,
+      blink::WebMediaStream* web_stream,
       bool request_succeeded);
 
   // This function is virtual for test purposes. A test can override this to
   // test requesting local media streams. The function notifies WebKit that the
   // |request| have completed and generated the MediaStream |stream|.
   virtual void CompleteGetUserMediaRequest(
-      const WebKit::WebMediaStream& stream,
-      WebKit::WebUserMediaRequest* request_info,
+      const blink::WebMediaStream& stream,
+      blink::WebUserMediaRequest* request_info,
       bool request_succeeded);
 
   // Returns the WebKit representation of a MediaStream given an URL.
   // This is virtual for test purposes.
-  virtual WebKit::WebMediaStream GetMediaStream(const GURL& url);
+  virtual blink::WebMediaStream GetMediaStream(const GURL& url);
 
  private:
   // Structure for storing information about a WebKit request to create a
   // MediaStream.
   struct UserMediaRequestInfo {
     UserMediaRequestInfo(int request_id,
-                         WebKit::WebFrame* frame,
-                         const WebKit::WebUserMediaRequest& request,
+                         blink::WebFrame* frame,
+                         const blink::WebUserMediaRequest& request,
                          bool enable_automatic_output_device_selection);
     ~UserMediaRequestInfo();
     int request_id;
@@ -131,22 +131,22 @@ class CONTENT_EXPORT MediaStreamImpl
     // OnStreamGenerated.
     bool generated;
     const bool enable_automatic_output_device_selection;
-    WebKit::WebFrame* frame;  // WebFrame that requested the MediaStream.
-    WebKit::WebMediaStream web_stream;
-    WebKit::WebUserMediaRequest request;
-    std::vector<WebKit::WebMediaStreamSource> sources;
+    blink::WebFrame* frame;  // WebFrame that requested the MediaStream.
+    blink::WebMediaStream web_stream;
+    blink::WebUserMediaRequest request;
+    std::vector<blink::WebMediaStreamSource> sources;
   };
   typedef ScopedVector<UserMediaRequestInfo> UserMediaRequests;
 
   struct LocalStreamSource {
-    LocalStreamSource(WebKit::WebFrame* frame,
-                      const WebKit::WebMediaStreamSource& source)
+    LocalStreamSource(blink::WebFrame* frame,
+                      const blink::WebMediaStreamSource& source)
         : frame(frame), source(source) {
     }
     // |frame| is the WebFrame that requested |source|. NULL in unit tests.
     // TODO(perkj): Change so that |frame| is not NULL in unit tests.
-    WebKit::WebFrame* frame;
-    WebKit::WebMediaStreamSource source;
+    blink::WebFrame* frame;
+    blink::WebMediaStreamSource source;
   };
   typedef std::vector<LocalStreamSource> LocalStreamSources;
 
@@ -155,27 +155,27 @@ class CONTENT_EXPORT MediaStreamImpl
   void CreateWebKitSourceVector(
       const std::string& label,
       const StreamDeviceInfoArray& devices,
-      WebKit::WebMediaStreamSource::Type type,
-      WebKit::WebFrame* frame,
-      WebKit::WebVector<WebKit::WebMediaStreamSource>& webkit_sources);
+      blink::WebMediaStreamSource::Type type,
+      blink::WebFrame* frame,
+      blink::WebVector<blink::WebMediaStreamSource>& webkit_sources);
 
   UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id);
   UserMediaRequestInfo* FindUserMediaRequestInfo(
-      WebKit::WebMediaStream* web_stream);
+      blink::WebMediaStream* web_stream);
   UserMediaRequestInfo* FindUserMediaRequestInfo(
-      const WebKit::WebUserMediaRequest& request);
+      const blink::WebUserMediaRequest& request);
   UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label);
   void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request);
 
   // Returns the source that use a device with |device.session_id|
   // and |device.device.id|. NULL if such source doesn't exist.
-  const WebKit::WebMediaStreamSource* FindLocalSource(
+  const blink::WebMediaStreamSource* FindLocalSource(
       const StreamDeviceInfo& device) const;
 
   // Returns true if |source| exists in |user_media_requests_|
-  bool FindSourceInRequests(const WebKit::WebMediaStreamSource& source) const;
+  bool FindSourceInRequests(const blink::WebMediaStreamSource& source) const;
 
-  void StopLocalSource(const WebKit::WebMediaStreamSource& source,
+  void StopLocalSource(const blink::WebMediaStreamSource& source,
                        bool notify_dispatcher);
   // Stops all local sources that don't exist in exist in
   // |user_media_requests_|.