| Index: content/browser/media/android/media_resource_getter_impl.h
|
| diff --git a/content/browser/media/android/media_resource_getter_impl.h b/content/browser/media/android/media_resource_getter_impl.h
|
| index c1ed4b97b36bbeaaa6840815473e60e9d531c2e4..bb4b001e01df8e5bce4490479d85a0122c1cc932 100644
|
| --- a/content/browser/media/android/media_resource_getter_impl.h
|
| +++ b/content/browser/media/android/media_resource_getter_impl.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "media/base/android/media_resource_getter.h"
|
| +#include "net/base/auth.h"
|
| #include "net/cookies/canonical_cookie.h"
|
|
|
| namespace fileapi {
|
| @@ -41,20 +42,30 @@ class MediaResourceGetterImpl : public media::MediaResourceGetter {
|
|
|
| // media::MediaResourceGetter implementation.
|
| // Must be called on the UI thread.
|
| - virtual void GetCookies(const GURL& url,
|
| - const GURL& first_party_for_cookies,
|
| - const GetCookieCB& callback) OVERRIDE;
|
| + virtual void GetAuthCredentials(
|
| + const GURL& url,
|
| + const GetAuthCredentialsCB& callback) OVERRIDE;
|
| + virtual void GetCookies(
|
| + const GURL& url,
|
| + const GURL& first_party_for_cookies,
|
| + const GetCookieCB& callback) OVERRIDE;
|
| virtual void GetPlatformPathFromURL(
|
| const GURL& url,
|
| const GetPlatformPathCB& callback) OVERRIDE;
|
| virtual void ExtractMediaMetadata(
|
| - const std::string& url, const std::string& cookies,
|
| + const std::string& url,
|
| + const std::string& cookies,
|
| const std::string& user_agent,
|
| const ExtractMediaMetadataCB& callback) OVERRIDE;
|
|
|
| static bool RegisterMediaResourceGetter(JNIEnv* env);
|
|
|
| private:
|
| + // Called when GetAuthCredentials() finishes.
|
| + void GetAuthCredentialsCallback(
|
| + const GetAuthCredentialsCB& callback,
|
| + const net::AuthCredentials& credentials);
|
| +
|
| // Called when GetCookies() finishes.
|
| void GetCookiesCallback(
|
| const GetCookieCB& callback, const std::string& cookies);
|
|
|