diff options
| author | dcheng <dcheng@chromium.org> | 2016-03-10 21:40:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 05:42:48 +0000 |
| commit | 9502adfa9aa5b3f3a7b06bbd23503ced64387df2 (patch) | |
| tree | 9c6cae3f941dca306088ea823e1c0a70587d9086 /media/base | |
| parent | 1311fa86d61376ad6f35b733cfa0c3f7bbae28ad (diff) | |
| download | chromium_src-9502adfa9aa5b3f3a7b06bbd23503ced64387df2.zip chromium_src-9502adfa9aa5b3f3a7b06bbd23503ced64387df2.tar.gz chromium_src-9502adfa9aa5b3f3a7b06bbd23503ced64387df2.tar.bz2 | |
Change scoped_ptr to a type alias for std::unique_ptr for OS_ANDROID
BUG=554298,579269
R=danakj@chromium.org
TBR=qinmin@chromium.org,torne@chromium.org,yfriedman@chromium.org
Review URL: https://codereview.chromium.org/1782443008
Cr-Commit-Position: refs/heads/master@{#380543}
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/android/media_codec_player_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/android/media_codec_player_unittest.cc b/media/base/android/media_codec_player_unittest.cc index 10ce91c..5076e48 100644 --- a/media/base/android/media_codec_player_unittest.cc +++ b/media/base/android/media_codec_player_unittest.cc @@ -382,7 +382,7 @@ class MockDemuxerAndroid : public DemuxerAndroid { // Conditions to wait for. bool IsInitialized() const { return client_; } - bool HasPendingConfigs() const { return pending_configs_; } + bool HasPendingConfigs() const { return !!pending_configs_; } bool ReceivedSeekRequest() const { return num_seeks_ > 0; } bool ReceivedBrowserSeekRequest() const { return num_browser_seeks_ > 0; } |