Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3

1 files changed, 7 insertions, 8 deletions

diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index 2ee130da8b..091a7f8e6b 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -418,22 +418,21 @@ class MockBrowserContext : public BrowserContext {
                     int render_view_id,
                     int bridge_id,
                     const GURL& requesting_frame));
-  MOCK_METHOD6(RequestProtectedMediaIdentifierPermission,
+  MOCK_METHOD4(RequestProtectedMediaIdentifierPermission,
                void(int render_process_id,
                     int render_view_id,
-                    int bridge_id,
-                    int group_id,
-                    const GURL& requesting_frame,
+                    const GURL& origin,
                     const ProtectedMediaIdentifierPermissionCallback&
                         callback));
-  MOCK_METHOD1(CancelProtectedMediaIdentifierPermissionRequests,
-               void(int group_id));
+  MOCK_METHOD3(CancelProtectedMediaIdentifierPermissionRequests,
+               void(int render_process_id,
+                    int render_view_id,
+                    const GURL& origin));
   MOCK_METHOD0(GetResourceContext, ResourceContext*());
   MOCK_METHOD0(GetDownloadManagerDelegate, DownloadManagerDelegate*());
   MOCK_METHOD0(GetGeolocationPermissionContext,
                GeolocationPermissionContext* ());
-  MOCK_METHOD0(GetGuestManagerDelegate,
-               BrowserPluginGuestManagerDelegate* ());
+  MOCK_METHOD0(GetGuestManager, BrowserPluginGuestManager* ());
   MOCK_METHOD0(GetSpecialStoragePolicy, quota::SpecialStoragePolicy*());
 };