Inject CanAddURLToHistory into TopSitesImpl

content/renderer/pepper/content_decryptor_delegate.h

 // 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.
 
 #ifndef CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
 
 #include <map>
 #include <queue>
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/cdm_promise_adapter.h"
 #include "media/base/channel_layout.h"
 #include "media/base/decryptor.h"
@@ skipping 32 matching lines @@
       const media::SessionMessageCB& session_message_cb,
       const media::SessionClosedCB& session_closed_cb,
       const media::LegacySessionErrorCB& legacy_session_error_cb,
       const media::SessionKeysChangeCB& session_keys_change_cb,
       const media::SessionExpirationUpdateCB& session_expiration_update_cb,
       const base::Closure& fatal_plugin_error_cb);
 
   void InstanceCrashed();
 
   // Provides access to PPP_ContentDecryptor_Private.
-  void SetServerCertificate(const uint8_t* certificate,
-                            uint32_t certificate_length,
+  void SetServerCertificate(const std::vector<uint8_t>& certificate,
                             scoped_ptr<media::SimpleCdmPromise> promise);
   void CreateSessionAndGenerateRequest(
       media::MediaKeys::SessionType session_type,
       media::EmeInitDataType init_data_type,
-      const uint8* init_data,
-      int init_data_length,
+      const std::vector<uint8_t>& init_data,
       scoped_ptr<media::NewSessionCdmPromise> promise);
   void LoadSession(media::MediaKeys::SessionType session_type,
                    const std::string& session_id,
                    scoped_ptr<media::NewSessionCdmPromise> promise);
   void UpdateSession(const std::string& session_id,
-                     const uint8* response,
-                     int response_length,
+                     const std::vector<uint8_t>& response,
                      scoped_ptr<media::SimpleCdmPromise> promise);
   void CloseSession(const std::string& session_id,
                     scoped_ptr<media::SimpleCdmPromise> promise);
   void RemoveSession(const std::string& session_id,
                      scoped_ptr<media::SimpleCdmPromise> promise);
   bool Decrypt(media::Decryptor::StreamType stream_type,
                const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
                const media::Decryptor::DecryptCB& decrypt_cb);
   bool CancelDecrypt(media::Decryptor::StreamType stream_type);
   bool InitializeAudioDecoder(
       const media::AudioDecoderConfig& decoder_config,
       const media::Decryptor::DecoderInitCB& decoder_init_cb);
   bool InitializeVideoDecoder(
       const media::VideoDecoderConfig& decoder_config,
       const media::Decryptor::DecoderInitCB& decoder_init_cb);
   // TODO(tomfinegan): Add callback args for DeinitializeDecoder() and
   // ResetDecoder()
   bool DeinitializeDecoder(media::Decryptor::StreamType stream_type);
   bool ResetDecoder(media::Decryptor::StreamType stream_type);
   // Note: These methods can be used with unencrypted data.
   bool DecryptAndDecodeAudio(
       const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
       const media::Decryptor::AudioDecodeCB& audio_decode_cb);
   bool DecryptAndDecodeVideo(
       const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
       const media::Decryptor::VideoDecodeCB& video_decode_cb);
 
   // PPB_ContentDecryptor_Private dispatching methods.
-  void OnPromiseResolved(uint32 promise_id);
-  void OnPromiseResolvedWithSession(uint32 promise_id, PP_Var session_id);
-  void OnPromiseRejected(uint32 promise_id,
+  void OnPromiseResolved(uint32_t promise_id);
+  void OnPromiseResolvedWithSession(uint32_t promise_id, PP_Var session_id);
+  void OnPromiseRejected(uint32_t promise_id,
                          PP_CdmExceptionCode exception_code,
-                         uint32 system_code,
+                         uint32_t system_code,
                          PP_Var error_description);
   void OnSessionMessage(PP_Var session_id,
                         PP_CdmMessageType message_type,
                         PP_Var message,
                         PP_Var legacy_destination_url);
   void OnSessionKeysChange(PP_Var session_id,
                            PP_Bool has_additional_usable_key,
                            uint32_t key_count,
                            const struct PP_KeyInformation key_information[]);
   void OnSessionExpirationChange(PP_Var session_id, PP_Time new_expiry_time);
   void OnSessionClosed(PP_Var session_id);
   void OnLegacySessionError(PP_Var session_id,
                             PP_CdmExceptionCode exception_code,
-                            uint32 system_code,
+                            uint32_t system_code,
                             PP_Var error_description);
   void DeliverBlock(PP_Resource decrypted_block,
                     const PP_DecryptedBlockInfo* block_info);
   void DecoderInitializeDone(PP_DecryptorStreamType decoder_type,
                              uint32_t request_id,
                              PP_Bool success);
   void DecoderDeinitializeDone(PP_DecryptorStreamType decoder_type,
                                uint32_t request_id);
   void DecoderResetDone(PP_DecryptorStreamType decoder_type,
                         uint32_t request_id);
@@ skipping 112 matching lines @@
 
   base::WeakPtr<ContentDecryptorDelegate> weak_this_;
   base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_