Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
index 6005611..aafc6c0 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -42,7 +42,7 @@
// 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 @@
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;
@@ -76,7 +76,8 @@
const StreamDeviceInfoArray& audio_array,
const StreamDeviceInfoArray& video_array) OVERRIDE;
virtual void OnStreamGenerationFailed(int request_id) OVERRIDE;
- virtual void OnStopGeneratedStream(const std::string& label) OVERRIDE;
+ virtual void OnDeviceStopped(const std::string& label,
+ const StreamDeviceInfo& device_info) OVERRIDE;
virtual void OnDevicesEnumerated(
int request_id,
const StreamDeviceInfoArray& device_array) OVERRIDE;
@@ -88,11 +89,11 @@
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 +103,28 @@
// 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 +132,22 @@
// 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 +156,27 @@
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_|.