diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 22:23:08 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 22:23:08 +0000 |
| commit | 4b3006f0ecb22cd179404810dc3580ccf5fa129d (patch) | |
| tree | 84e36a40831bc716becc4e8df5729727b6fe8641 /media | |
| parent | 85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0 (diff) | |
| download | chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.zip chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.tar.gz chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.tar.bz2 | |
Update uses of Value in extensions/, google_apis/, gpu/, media/, net/, printing/, remoting/, rlz/, sync/, ui/ to use the base:: namespace.
BUG=88666
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/116433007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/cdm/json_web_key.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/media/cdm/json_web_key.cc b/media/cdm/json_web_key.cc index 522f1c9..a6aa885 100644 --- a/media/cdm/json_web_key.cc +++ b/media/cdm/json_web_key.cc @@ -81,7 +81,7 @@ std::string GenerateJWKSet(const uint8* key, int key_length, // Processes a JSON Web Key to extract the key id and key value. Sets |jwk_key| // to the id/value pair and returns true on success. -static bool ConvertJwkToKeyPair(const DictionaryValue& jwk, +static bool ConvertJwkToKeyPair(const base::DictionaryValue& jwk, KeyIdAndKeyPair* jwk_key) { // Have found a JWK, start by checking that it is a symmetric key. std::string type; @@ -124,13 +124,14 @@ bool ExtractKeysFromJWKSet(const std::string& jwk_set, KeyIdAndKeyPairs* keys) { if (!IsStringASCII(jwk_set)) return false; - scoped_ptr<Value> root(base::JSONReader().ReadToValue(jwk_set)); - if (!root.get() || root->GetType() != Value::TYPE_DICTIONARY) + scoped_ptr<base::Value> root(base::JSONReader().ReadToValue(jwk_set)); + if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) return false; // Locate the set from the dictionary. - DictionaryValue* dictionary = static_cast<DictionaryValue*>(root.get()); - ListValue* list_val = NULL; + base::DictionaryValue* dictionary = + static_cast<base::DictionaryValue*>(root.get()); + base::ListValue* list_val = NULL; if (!dictionary->GetList(kKeysTag, &list_val)) { DVLOG(1) << "Missing '" << kKeysTag << "' parameter or not a list in JWK Set"; @@ -141,7 +142,7 @@ bool ExtractKeysFromJWKSet(const std::string& jwk_set, KeyIdAndKeyPairs* keys) { // success. KeyIdAndKeyPairs local_keys; for (size_t i = 0; i < list_val->GetSize(); ++i) { - DictionaryValue* jwk = NULL; + base::DictionaryValue* jwk = NULL; if (!list_val->GetDictionary(i, &jwk)) { DVLOG(1) << "Unable to access '" << kKeysTag << "'[" << i << "] in JWK Set"; |