media/base/android/media_source_player_unittest.cc - Issue 297703002: Using GURL in place of std::string for destination_url

Side by Side Diff: media/base/android/media_source_player_unittest.cc

Issue 297703002: Using GURL in place of std::string for destination_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressing comments, adding checks Created 6 years, 7 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 unified diff | Download patch

« content/renderer/pepper/content_decryptor_delegate.cc ('K') | « media/base/android/media_player_manager.h ('k') | media/base/media_keys.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <string>	5 #include <string>

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/strings/stringprintf.h"	10 #include "base/strings/stringprintf.h"

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; }	73 virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; }

74 virtual void DestroyAllMediaPlayers() OVERRIDE {}	74 virtual void DestroyAllMediaPlayers() OVERRIDE {}

75 virtual MediaKeys* GetCdm(int cdm_id) OVERRIDE { return NULL; }	75 virtual MediaKeys* GetCdm(int cdm_id) OVERRIDE { return NULL; }

76 virtual void RequestFullScreen(int player_id) OVERRIDE {}	76 virtual void RequestFullScreen(int player_id) OVERRIDE {}

77 virtual void OnSessionCreated(int cdm_id,	77 virtual void OnSessionCreated(int cdm_id,

78 uint32 session_id,	78 uint32 session_id,

79 const std::string& web_session_id) OVERRIDE {}	79 const std::string& web_session_id) OVERRIDE {}

80 virtual void OnSessionMessage(int cdm_id,	80 virtual void OnSessionMessage(int cdm_id,

81 uint32 session_id,	81 uint32 session_id,

82 const std::vector<uint8>& message,	82 const std::vector<uint8>& message,

83 const std::string& destination_url) OVERRIDE {}	83 const GURL& destination_url) OVERRIDE {}

84 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE {}	84 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE {}

85 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE {}	85 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE {}

86 virtual void OnSessionError(int cdm_id,	86 virtual void OnSessionError(int cdm_id,

87 uint32 session_id,	87 uint32 session_id,

88 media::MediaKeys::KeyError error_code,	88 media::MediaKeys::KeyError error_code,

89 uint32 system_code) OVERRIDE {}	89 uint32 system_code) OVERRIDE {}

90	90

91 bool playback_completed() const {	91 bool playback_completed() const {

92 return playback_completed_;	92 return playback_completed_;

93 }	93 }

(...skipping 1899 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1993	1993

1994 DecodeAudioDataUntilOutputBecomesAvailable();	1994 DecodeAudioDataUntilOutputBecomesAvailable();

1995	1995

1996 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(true, 0);	1996 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(true, 0);

1997 player_.OnDemuxerDataAvailable(data);	1997 player_.OnDemuxerDataAvailable(data);

1998 WaitForAudioDecodeDone();	1998 WaitForAudioDecodeDone();

1999 DecodeAudioDataUntilOutputBecomesAvailable();	1999 DecodeAudioDataUntilOutputBecomesAvailable();

2000 }	2000 }

2001	2001

2002 } // namespace media	2002 } // namespace media

OLD	NEW