Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Unified Diff: content/browser/media/cdm/browser_cdm_manager.cc

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index 88cf526190622cb798653f18183639132d741d80..8f1e78ae84324ea41406913c2d156bda8fa0774b 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -324,8 +324,7 @@ void BrowserCdmManager::OnSetServerCertificate(
return;
}
- cdm->SetServerCertificate(&certificate[0], certificate.size(),
- promise.Pass());
+ cdm->SetServerCertificate(certificate, promise.Pass());
}
void BrowserCdmManager::OnCreateSessionAndGenerateRequest(
@@ -405,7 +404,7 @@ void BrowserCdmManager::OnUpdateSession(int render_frame_id,
return;
}
- cdm->UpdateSession(session_id, &response[0], response.size(), promise.Pass());
+ cdm->UpdateSession(session_id, response, promise.Pass());
}
void BrowserCdmManager::OnCloseSession(int render_frame_id,
@@ -577,8 +576,8 @@ void BrowserCdmManager::CreateSessionAndGenerateRequestIfPermitted(
// Only the temporary session type is supported in browser CDM path.
// TODO(xhwang): Add SessionType support if needed.
cdm->CreateSessionAndGenerateRequest(media::MediaKeys::TEMPORARY_SESSION,
- init_data_type, &init_data[0],
- init_data.size(), promise.Pass());
+ init_data_type, init_data,
+ promise.Pass());
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698