Inject CanAddURLToHistory into TopSitesImpl

media/test/pipeline_integration_test.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "media/base/cdm_callback_promise.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media.h"
 #include "media/base/media_keys.h"
 #include "media/base/media_switches.h"
 #include "media/base/test_data_util.h"
@@ skipping 292 matching lines @@
       return;
     prev_init_data_ = init_data;
 
     if (current_session_id_.empty()) {
       if (init_data_type == EmeInitDataType::CENC) {
         // Since the 'cenc' files are not created with proper 'pssh' boxes,
         // simply pretend that this is a webm file and pass the expected
         // key ID as the init_data.
         // http://crbug.com/460308
         decryptor->CreateSessionAndGenerateRequest(
-            MediaKeys::TEMPORARY_SESSION, EmeInitDataType::WEBM, kKeyId,
-            arraysize(kKeyId), CreateSessionPromise(RESOLVED));
+            MediaKeys::TEMPORARY_SESSION, EmeInitDataType::WEBM,
+            std::vector<uint8>(kKeyId, kKeyId + arraysize(kKeyId)),
+            CreateSessionPromise(RESOLVED));
       } else {
         decryptor->CreateSessionAndGenerateRequest(
-            MediaKeys::TEMPORARY_SESSION, init_data_type,
-            vector_as_array(&init_data), init_data.size(),
+            MediaKeys::TEMPORARY_SESSION, init_data_type, init_data,
             CreateSessionPromise(RESOLVED));
       }
       EXPECT_FALSE(current_session_id_.empty());
     }
 
     // Clear Key really needs the key ID from |init_data|. For WebM, they are
     // the same, but this is not the case for ISO CENC (key ID embedded in a
     // 'pssh' box). Therefore, provide the correct key ID.
     const uint8* key_id = vector_as_array(&init_data);
     size_t key_id_length = init_data.size();
     if (init_data_type == EmeInitDataType::CENC) {
       key_id = kKeyId;
       key_id_length = arraysize(kKeyId);
     }
 
     // Convert key into a JSON structure and then add it.
     std::string jwk = GenerateJWKSet(
         kSecretKey, arraysize(kSecretKey), key_id, key_id_length);
     decryptor->UpdateSession(current_session_id_,
-                             reinterpret_cast<const uint8*>(jwk.data()),
-                             jwk.size(),
+                             std::vector<uint8>(jwk.begin(), jwk.end()),
                              CreatePromise(RESOLVED));
   }
 
   std::string current_session_id_;
   std::vector<uint8> prev_init_data_;
 };
 
 class RotatingKeyProvidingApp : public KeyProvidingApp {
  public:
   RotatingKeyProvidingApp() : num_distint_need_key_calls_(0) {}
@@ skipping 15 matching lines @@
     std::vector<uint8> key_id;
     std::vector<uint8> key;
     EXPECT_TRUE(GetKeyAndKeyId(init_data, &key, &key_id));
 
     if (init_data_type == EmeInitDataType::CENC) {
       // Since the 'cenc' files are not created with proper 'pssh' boxes,
       // simply pretend that this is a webm file and pass the expected
       // key ID as the init_data.
       // http://crbug.com/460308
       decryptor->CreateSessionAndGenerateRequest(
-          MediaKeys::TEMPORARY_SESSION, EmeInitDataType::WEBM,
-          vector_as_array(&key_id), key_id.size(),
+          MediaKeys::TEMPORARY_SESSION, EmeInitDataType::WEBM, key_id,
           CreateSessionPromise(RESOLVED));
     } else {
       decryptor->CreateSessionAndGenerateRequest(
-          MediaKeys::TEMPORARY_SESSION, init_data_type,
-          vector_as_array(&init_data), init_data.size(),
+          MediaKeys::TEMPORARY_SESSION, init_data_type, init_data,
           CreateSessionPromise(RESOLVED));
     }
 
     // Convert key into a JSON structure and then add it.
     std::string jwk = GenerateJWKSet(vector_as_array(&key),
                                      key.size(),
                                      vector_as_array(&key_id),
                                      key_id.size());
     decryptor->UpdateSession(current_session_id_,
-                             reinterpret_cast<const uint8*>(jwk.data()),
-                             jwk.size(),
+                             std::vector<uint8>(jwk.begin(), jwk.end()),
                              CreatePromise(RESOLVED));
   }
 
  private:
   bool GetKeyAndKeyId(std::vector<uint8> init_data,
                       std::vector<uint8>* key,
                       std::vector<uint8>* key_id) {
     // For WebM, init_data is key_id; for ISO CENC, init_data should contain
     // the key_id. We assume key_id is in the end of init_data here (that is
     // only a reasonable assumption for WebM and clear key ISO CENC).
@@ skipping 1327 matching lines @@
 
 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
   ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
   ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
             demuxer_->GetStartTime());
 }
 
 }  // namespace media