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 /remoting | |
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 'remoting')
-rw-r--r-- | remoting/base/vlog_net_log.cc | 2 | ||||
-rw-r--r-- | remoting/host/json_host_config.cc | 7 | ||||
-rw-r--r-- | remoting/host/policy_hack/policy_watcher_linux.cc | 16 | ||||
-rw-r--r-- | remoting/host/policy_hack/policy_watcher_win.cc | 2 | ||||
-rw-r--r-- | remoting/host/setup/me2me_native_messaging_host.cc | 2 | ||||
-rw-r--r-- | remoting/host/setup/service_client.cc | 6 | ||||
-rw-r--r-- | remoting/host/token_validator_factory_impl.cc | 2 | ||||
-rw-r--r-- | remoting/host/token_validator_factory_impl_unittest.cc | 4 | ||||
-rw-r--r-- | remoting/protocol/pairing_registry.cc | 2 |
9 files changed, 22 insertions, 21 deletions
diff --git a/remoting/base/vlog_net_log.cc b/remoting/base/vlog_net_log.cc index ff2e3e3..aee63b8 100644 --- a/remoting/base/vlog_net_log.cc +++ b/remoting/base/vlog_net_log.cc @@ -33,7 +33,7 @@ VlogNetLog::Observer::~Observer() { void VlogNetLog::Observer::OnAddEntry(const net::NetLog::Entry& entry) { if (VLOG_IS_ON(4)) { - scoped_ptr<Value> value(entry.ToValue()); + scoped_ptr<base::Value> value(entry.ToValue()); std::string json; base::JSONWriter::Write(value.get(), &json); VLOG(4) << json; diff --git a/remoting/host/json_host_config.cc b/remoting/host/json_host_config.cc index 0a8db7c..7cd35f4 100644 --- a/remoting/host/json_host_config.cc +++ b/remoting/host/json_host_config.cc @@ -48,14 +48,15 @@ std::string JsonHostConfig::GetSerializedData() { } bool JsonHostConfig::SetSerializedData(const std::string& config) { - scoped_ptr<Value> value( + scoped_ptr<base::Value> value( base::JSONReader::Read(config, base::JSON_ALLOW_TRAILING_COMMAS)); - if (value.get() == NULL || !value->IsType(Value::TYPE_DICTIONARY)) { + if (value.get() == NULL || !value->IsType(base::Value::TYPE_DICTIONARY)) { LOG(WARNING) << "Failed to parse " << filename_.value(); return false; } - DictionaryValue* dictionary = static_cast<DictionaryValue*>(value.release()); + base::DictionaryValue* dictionary = + static_cast<base::DictionaryValue*>(value.release()); values_.reset(dictionary); return true; } diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc index da57f68..37ed8a0 100644 --- a/remoting/host/policy_hack/policy_watcher_linux.cc +++ b/remoting/host/policy_hack/policy_watcher_linux.cc @@ -126,7 +126,7 @@ class PolicyWatcherLinux : public PolicyWatcher { } // Returns NULL if the policy dictionary couldn't be read. - scoped_ptr<DictionaryValue> Load() { + scoped_ptr<base::DictionaryValue> Load() { DCHECK(OnPolicyWatcherThread()); // Enumerate the files and sort them lexicographically. std::set<base::FilePath> files; @@ -137,26 +137,26 @@ class PolicyWatcherLinux : public PolicyWatcher { files.insert(config_file_path); // Start with an empty dictionary and merge the files' contents. - scoped_ptr<DictionaryValue> policy(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> policy(new base::DictionaryValue()); for (std::set<base::FilePath>::iterator config_file_iter = files.begin(); config_file_iter != files.end(); ++config_file_iter) { JSONFileValueSerializer deserializer(*config_file_iter); deserializer.set_allow_trailing_comma(true); int error_code = 0; std::string error_msg; - scoped_ptr<Value> value( + scoped_ptr<base::Value> value( deserializer.Deserialize(&error_code, &error_msg)); if (!value.get()) { LOG(WARNING) << "Failed to read configuration file " << config_file_iter->value() << ": " << error_msg; - return scoped_ptr<DictionaryValue>(); + return scoped_ptr<base::DictionaryValue>(); } - if (!value->IsType(Value::TYPE_DICTIONARY)) { + if (!value->IsType(base::Value::TYPE_DICTIONARY)) { LOG(WARNING) << "Expected JSON dictionary in configuration file " << config_file_iter->value(); - return scoped_ptr<DictionaryValue>(); + return scoped_ptr<base::DictionaryValue>(); } - policy->MergeDictionary(static_cast<DictionaryValue*>(value.get())); + policy->MergeDictionary(static_cast<base::DictionaryValue*>(value.get())); } return policy.Pass(); @@ -179,7 +179,7 @@ class PolicyWatcherLinux : public PolicyWatcher { } // Load the policy definitions. - scoped_ptr<DictionaryValue> new_policy = Load(); + scoped_ptr<base::DictionaryValue> new_policy = Load(); if (new_policy.get()) { UpdatePolicies(new_policy.get()); ScheduleFallbackReloadTask(); diff --git a/remoting/host/policy_hack/policy_watcher_win.cc b/remoting/host/policy_hack/policy_watcher_win.cc index 7216b58..83f67430 100644 --- a/remoting/host/policy_hack/policy_watcher_win.cc +++ b/remoting/host/policy_hack/policy_watcher_win.cc @@ -194,7 +194,7 @@ class PolicyWatcherWin : void Reload() { DCHECK(OnPolicyWatcherThread()); SetupWatches(); - scoped_ptr<DictionaryValue> new_policy(Load()); + scoped_ptr<base::DictionaryValue> new_policy(Load()); UpdatePolicies(new_policy.get()); } diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc index 67fcaa7..025642e 100644 --- a/remoting/host/setup/me2me_native_messaging_host.cc +++ b/remoting/host/setup/me2me_native_messaging_host.cc @@ -400,7 +400,7 @@ void Me2MeNativeMessagingHost::SendConfigResponse( if (config) { response->Set("config", config.release()); } else { - response->Set("config", Value::CreateNullValue()); + response->Set("config", base::Value::CreateNullValue()); } channel_->SendMessage(response.Pass()); } diff --git a/remoting/host/setup/service_client.cc b/remoting/host/setup/service_client.cc index 43f24ca..0e7996c 100644 --- a/remoting/host/setup/service_client.cc +++ b/remoting/host/setup/service_client.cc @@ -145,11 +145,11 @@ void ServiceClient::Core::HandleResponse(const net::URLFetcher* source) { { std::string data; source->GetResponseAsString(&data); - scoped_ptr<Value> message_value(base::JSONReader::Read(data)); - DictionaryValue *dict; + scoped_ptr<base::Value> message_value(base::JSONReader::Read(data)); + base::DictionaryValue *dict; std::string code; if (message_value.get() && - message_value->IsType(Value::TYPE_DICTIONARY) && + message_value->IsType(base::Value::TYPE_DICTIONARY) && message_value->GetAsDictionary(&dict) && dict->GetString("data.authorizationCode", &code)) { delegate_->OnHostRegistered(code); diff --git a/remoting/host/token_validator_factory_impl.cc b/remoting/host/token_validator_factory_impl.cc index d93df62..8d536a6 100644 --- a/remoting/host/token_validator_factory_impl.cc +++ b/remoting/host/token_validator_factory_impl.cc @@ -131,7 +131,7 @@ class TokenValidatorImpl // Decode the JSON data from the response. scoped_ptr<base::Value> value(base::JSONReader::Read(data)); - DictionaryValue* dict; + base::DictionaryValue* dict; if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY || !value->GetAsDictionary(&dict)) { LOG(ERROR) << "Invalid token validation response: '" << data << "'"; diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc index 8737917..18208fa 100644 --- a/remoting/host/token_validator_factory_impl_unittest.cc +++ b/remoting/host/token_validator_factory_impl_unittest.cc @@ -66,7 +66,7 @@ class TokenValidatorFactoryImplTest : public testing::Test { } static std::string CreateResponse(const std::string& scope) { - DictionaryValue response_dict; + base::DictionaryValue response_dict; response_dict.SetString("access_token", kSharedSecret); response_dict.SetString("token_type", "shared_secret"); response_dict.SetString("scope", scope); @@ -76,7 +76,7 @@ class TokenValidatorFactoryImplTest : public testing::Test { } static std::string CreateErrorResponse(const std::string& error) { - DictionaryValue response_dict; + base::DictionaryValue response_dict; response_dict.SetString("error", error); std::string response; base::JSONWriter::Write(&response_dict, &response); diff --git a/remoting/protocol/pairing_registry.cc b/remoting/protocol/pairing_registry.cc index f1ce333..e33b59d 100644 --- a/remoting/protocol/pairing_registry.cc +++ b/remoting/protocol/pairing_registry.cc @@ -256,7 +256,7 @@ void PairingRegistry::SanitizePairings(const GetAllPairingsCallback& callback, scoped_ptr<base::ListValue> sanitized_pairings(new base::ListValue()); for (size_t i = 0; i < pairings->GetSize(); ++i) { - DictionaryValue* pairing_json; + base::DictionaryValue* pairing_json; if (!pairings->GetDictionary(i, &pairing_json)) { LOG(WARNING) << "A pairing entry is not a dictionary."; continue; |