diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 05:29:53 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 05:29:53 +0000 |
| commit | 8790210c68de5ab29e54a46f761a7a8d60430334 (patch) | |
| tree | 159098319252d715c174230adbeb88338a6f67e4 /content/renderer/media/crypto | |
| parent | 05fd507a71a552edc3290adc35c45dfdc13d251a (diff) | |
| download | chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.zip chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.tar.gz chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.tar.bz2 | |
Move EmptyString, kWhitespace and the BOM to base.
This moves EmptyString*, kWhitespace*, and the UTF 8 Byte Order Marker to the base:: namespace.
Many of them just got changed to a default-constructed string when a reference was not required.
I qualified some string16s with base:: when I was changing adjacent code. I need to do another pass to finish these up.
BUG=
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/89243003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/crypto')
| -rw-r--r-- | content/renderer/media/crypto/proxy_decryptor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc index 088decc..4716405 100644 --- a/content/renderer/media/crypto/proxy_decryptor.cc +++ b/content/renderer/media/crypto/proxy_decryptor.cc @@ -264,7 +264,7 @@ const std::string& ProxyDecryptor::LookupSessionId(uint32 reference_id) { // Session may not exist if error happens during GenerateKeyRequest(). SessionIdMap::iterator it = sessions_.find(reference_id); - return (it != sessions_.end()) ? it->second : EmptyString(); + return (it != sessions_.end()) ? it->second : base::EmptyString(); } } // namespace content |