Inject CanAddURLToHistory into TopSitesImpl

content/browser/media/cdm/browser_cdm_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/cdm/browser_cdm_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 306 matching lines @@
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   if (certificate.empty()) {
     promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0, "Empty certificate.");
     return;
   }
 
-  cdm->SetServerCertificate(&certificate[0], certificate.size(),
-                            promise.Pass());
+  cdm->SetServerCertificate(certificate, promise.Pass());
 }
 
 void BrowserCdmManager::OnCreateSessionAndGenerateRequest(
     int render_frame_id,
     int cdm_id,
     uint32_t promise_id,
     CdmHostMsg_CreateSession_InitDataType init_data_type,
     const std::vector<uint8>& init_data) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
@@ skipping 59 matching lines @@
                  << " is too long: " << response.size();
     promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0, "Response too long.");
     return;
   }
 
   if (response.empty()) {
     promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0, "Response is empty.");
     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,
                                        int cdm_id,
                                        uint32_t promise_id,
                                        const std::string& session_id) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   scoped_ptr<SimplePromise> promise(
       new SimplePromise(this, render_frame_id, cdm_id, promise_id));
@@ skipping 151 matching lines @@
 
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   // 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