diff options
author | brettw <brettw@chromium.org> | 2015-06-11 18:57:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-12 01:59:01 +0000 |
commit | 44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2 (patch) | |
tree | 30eccdbbe72fb47810535fe56e0a8313be2db4b2 /media | |
parent | 57ca2cd795596162f06a6aa67367d8ce0d9ded52 (diff) | |
download | chromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.zip chromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.tar.gz chromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.tar.bz2 |
Move StartsWith[ASCII] to base namespace.
NOPRESUBMIT=true
(no presubmit due to removing base:: from a ScopedAllowIO)
Review URL: https://codereview.chromium.org/1172183002
Cr-Commit-Position: refs/heads/master@{#334108}
Diffstat (limited to 'media')
-rw-r--r-- | media/base/android/media_codec_bridge.cc | 8 | ||||
-rw-r--r-- | media/base/android/media_player_bridge.cc | 2 | ||||
-rw-r--r-- | media/base/key_systems.cc | 4 | ||||
-rw-r--r-- | media/base/mime_util.cc | 4 | ||||
-rw-r--r-- | media/filters/source_buffer_stream_unittest.cc | 2 | ||||
-rw-r--r-- | media/renderers/video_renderer_impl.cc | 3 | ||||
-rw-r--r-- | media/video/capture/win/video_capture_device_factory_win.cc | 2 |
7 files changed, 13 insertions, 12 deletions
diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc index 14f3300..3d22752 100644 --- a/media/base/android/media_codec_bridge.cc +++ b/media/base/android/media_codec_bridge.cc @@ -246,10 +246,10 @@ bool MediaCodecBridge::IsKnownUnaccelerated(const std::string& mime_type, // devices while HW decoder video freezes and distortions are // investigated - http://crbug.com/446974. if (codec_name.length() > 0) { - return (StartsWithASCII(codec_name, "OMX.google.", true) || - StartsWithASCII(codec_name, "OMX.SEC.", true) || - StartsWithASCII(codec_name, "OMX.MTK.", true) || - StartsWithASCII(codec_name, "OMX.Exynos.", true)); + return (base::StartsWithASCII(codec_name, "OMX.google.", true) || + base::StartsWithASCII(codec_name, "OMX.SEC.", true) || + base::StartsWithASCII(codec_name, "OMX.MTK.", true) || + base::StartsWithASCII(codec_name, "OMX.Exynos.", true)); } return true; } diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc index 29049cb..de32bc4 100644 --- a/media/base/android/media_player_bridge.cc +++ b/media/base/android/media_player_bridge.cc @@ -161,7 +161,7 @@ void MediaPlayerBridge::SetDataSource(const std::string& url) { DCHECK(j_context); const std::string data_uri_prefix("data:"); - if (StartsWithASCII(url, data_uri_prefix, true)) { + if (base::StartsWithASCII(url, data_uri_prefix, true)) { if (!Java_MediaPlayerBridge_setDataUriDataSource( env, j_media_player_bridge_.obj(), j_context, j_url_string.obj())) { OnMediaError(MEDIA_ERROR_FORMAT); diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc index 1cd202c..6b4d0c3 100644 --- a/media/base/key_systems.cc +++ b/media/base/key_systems.cc @@ -674,12 +674,12 @@ EmeConfigRule KeySystemsImpl::GetContentTypeConfigRule( SupportedCodecs media_type_codec_mask = EME_CODEC_NONE; switch (media_type) { case EmeMediaType::AUDIO: - if (!StartsWithASCII(container_mime_type, "audio/", true)) + if (!base::StartsWithASCII(container_mime_type, "audio/", true)) return EmeConfigRule::NOT_SUPPORTED; media_type_codec_mask = audio_codec_mask_; break; case EmeMediaType::VIDEO: - if (!StartsWithASCII(container_mime_type, "video/", true)) + if (!base::StartsWithASCII(container_mime_type, "video/", true)) return EmeConfigRule::NOT_SUPPORTED; media_type_codec_mask = video_codec_mask_; break; diff --git a/media/base/mime_util.cc b/media/base/mime_util.cc index 030a4ee..83eef20 100644 --- a/media/base/mime_util.cc +++ b/media/base/mime_util.cc @@ -539,8 +539,8 @@ static bool ParseH264CodecID(const std::string& codec_id, bool* is_ambiguous) { // Make sure we have avc1.xxxxxx or avc3.xxxxxx if (codec_id.size() != 11 || - (!StartsWithASCII(codec_id, "avc1.", true) && - !StartsWithASCII(codec_id, "avc3.", true))) { + (!base::StartsWithASCII(codec_id, "avc1.", true) && + !base::StartsWithASCII(codec_id, "avc3.", true))) { return false; } diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc index e360ba5..d08b6c17 100644 --- a/media/filters/source_buffer_stream_unittest.cc +++ b/media/filters/source_buffer_stream_unittest.cc @@ -501,7 +501,7 @@ class SourceBufferStreamTest : public testing::Test { bool is_duration_estimated = false; // Handle splice frame starts. - if (StartsWithASCII(timestamps[i], "S(", true)) { + if (base::StartsWithASCII(timestamps[i], "S(", true)) { CHECK(!splice_frame); splice_frame = true; // Remove the "S(" off of the token. diff --git a/media/renderers/video_renderer_impl.cc b/media/renderers/video_renderer_impl.cc index 95067fa..d688ca5 100644 --- a/media/renderers/video_renderer_impl.cc +++ b/media/renderers/video_renderer_impl.cc @@ -36,7 +36,8 @@ static bool ShouldUseVideoRenderingPath() { const bool disabled_via_cli = base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableNewVideoRenderer); - return !disabled_via_cli && !StartsWithASCII(group_name, "Disabled", true); + return !disabled_via_cli && + !base::StartsWithASCII(group_name, "Disabled", true); } VideoRendererImpl::VideoRendererImpl( diff --git a/media/video/capture/win/video_capture_device_factory_win.cc b/media/video/capture/win/video_capture_device_factory_win.cc index 8b018fb..8aba237 100644 --- a/media/video/capture/win/video_capture_device_factory_win.cc +++ b/media/video/capture/win/video_capture_device_factory_win.cc @@ -103,7 +103,7 @@ static bool IsDeviceBlackListed(const std::string& name) { DCHECK_EQ(BLACKLISTED_CAMERA_MAX + 1, static_cast<int>(arraysize(kBlacklistedCameraNames))); for (size_t i = 0; i < arraysize(kBlacklistedCameraNames); ++i) { - if (StartsWithASCII(name, kBlacklistedCameraNames[i], false)) { + if (base::StartsWithASCII(name, kBlacklistedCameraNames[i], false)) { DVLOG(1) << "Enumerated blacklisted device: " << name; UMA_HISTOGRAM_ENUMERATION("Media.VideoCapture.BlacklistedDevice", i, BLACKLISTED_CAMERA_MAX + 1); |