| Index: services/catalog/entry.cc
|
| diff --git a/services/catalog/entry.cc b/services/catalog/entry.cc
|
| index e892ecf8abdd4945f3e2e59ea18324468af85ab6..5623458b629423598c561819f4ffc5a247a852bf 100644
|
| --- a/services/catalog/entry.cc
|
| +++ b/services/catalog/entry.cc
|
| @@ -18,7 +18,7 @@ bool ReadStringSet(const base::ListValue& list_value,
|
| for (const auto& value_value : list_value) {
|
| std::string value;
|
| if (!value_value->GetAsString(&value)) {
|
| - LOG(ERROR) << "Entry::Deserialize: list member must be a string";
|
| + VLOG(1) << "Entry::Deserialize: list member must be a string";
|
| return false;
|
| }
|
| string_set->insert(value);
|
| @@ -30,7 +30,7 @@ bool ReadStringSetFromValue(const base::Value& value,
|
| std::set<std::string>* string_set) {
|
| const base::ListValue* list_value = nullptr;
|
| if (!value.GetAsList(&list_value)) {
|
| - LOG(ERROR) << "Entry::Deserialize: Value must be a list.";
|
| + VLOG(1) << "Entry::Deserialize: Value must be a list.";
|
| return false;
|
| }
|
| return ReadStringSet(*list_value, string_set);
|
| @@ -44,7 +44,7 @@ bool BuildInterfaceProviderSpec(
|
| if (value.HasKey(Store::kInterfaceProviderSpecs_ProvidesKey) &&
|
| !value.GetDictionary(Store::kInterfaceProviderSpecs_ProvidesKey,
|
| &provides_value)) {
|
| - LOG(ERROR) << "Entry::Deserialize: "
|
| + VLOG(1) << "Entry::Deserialize: "
|
| << Store::kInterfaceProviderSpecs_ProvidesKey
|
| << " must be a dictionary.";
|
| return false;
|
| @@ -54,7 +54,7 @@ bool BuildInterfaceProviderSpec(
|
| for(; !it.IsAtEnd(); it.Advance()) {
|
| service_manager::InterfaceSet interfaces;
|
| if (!ReadStringSetFromValue(it.value(), &interfaces)) {
|
| - LOG(ERROR) << "Entry::Deserialize: Invalid interface list in provided "
|
| + VLOG(1) << "Entry::Deserialize: Invalid interface list in provided "
|
| << " capabilities dictionary";
|
| return false;
|
| }
|
| @@ -66,7 +66,7 @@ bool BuildInterfaceProviderSpec(
|
| if (value.HasKey(Store::kInterfaceProviderSpecs_RequiresKey) &&
|
| !value.GetDictionary(Store::kInterfaceProviderSpecs_RequiresKey,
|
| &requires_value)) {
|
| - LOG(ERROR) << "Entry::Deserialize: "
|
| + VLOG(1) << "Entry::Deserialize: "
|
| << Store::kInterfaceProviderSpecs_RequiresKey
|
| << " must be a dictionary.";
|
| return false;
|
| @@ -77,13 +77,13 @@ bool BuildInterfaceProviderSpec(
|
| service_manager::CapabilitySet capabilities;
|
| const base::ListValue* entry_value = nullptr;
|
| if (!it.value().GetAsList(&entry_value)) {
|
| - LOG(ERROR) << "Entry::Deserialize: "
|
| + VLOG(1) << "Entry::Deserialize: "
|
| << Store::kInterfaceProviderSpecs_RequiresKey
|
| << " entry must be a list.";
|
| return false;
|
| }
|
| if (!ReadStringSet(*entry_value, &capabilities)) {
|
| - LOG(ERROR) << "Entry::Deserialize: Invalid capabilities list in "
|
| + VLOG(1) << "Entry::Deserialize: Invalid capabilities list in "
|
| << "requires dictionary.";
|
| return false;
|
| }
|
| @@ -141,12 +141,12 @@ std::unique_ptr<Entry> Entry::Deserialize(const base::DictionaryValue& value) {
|
| // Name.
|
| std::string name_string;
|
| if (!value.GetString(Store::kNameKey, &name_string)) {
|
| - LOG(ERROR) << "Entry::Deserialize: dictionary has no "
|
| + VLOG(1) << "Entry::Deserialize: dictionary has no "
|
| << Store::kNameKey << " key";
|
| return nullptr;
|
| }
|
| if (!service_manager::IsValidName(name_string)) {
|
| - LOG(ERROR) << "Entry::Deserialize: " << name_string << " is not a valid "
|
| + VLOG(1) << "Entry::Deserialize: " << name_string << " is not a valid "
|
| << "Mojo name";
|
| return nullptr;
|
| }
|
| @@ -155,7 +155,7 @@ std::unique_ptr<Entry> Entry::Deserialize(const base::DictionaryValue& value) {
|
| // Human-readable name.
|
| std::string display_name;
|
| if (!value.GetString(Store::kDisplayNameKey, &display_name)) {
|
| - LOG(ERROR) << "Entry::Deserialize: dictionary has no "
|
| + VLOG(1) << "Entry::Deserialize: dictionary has no "
|
| << Store::kDisplayNameKey << " key";
|
| return nullptr;
|
| }
|
| @@ -165,7 +165,7 @@ std::unique_ptr<Entry> Entry::Deserialize(const base::DictionaryValue& value) {
|
| const base::DictionaryValue* interface_provider_specs = nullptr;
|
| if (!value.GetDictionary(Store::kInterfaceProviderSpecsKey,
|
| &interface_provider_specs)) {
|
| - LOG(ERROR) << "Entry::Deserialize: dictionary has no "
|
| + VLOG(1) << "Entry::Deserialize: dictionary has no "
|
| << Store::kInterfaceProviderSpecsKey << " key";
|
| return nullptr;
|
| }
|
| @@ -174,14 +174,14 @@ std::unique_ptr<Entry> Entry::Deserialize(const base::DictionaryValue& value) {
|
| for (; !it.IsAtEnd(); it.Advance()) {
|
| const base::DictionaryValue* spec_value = nullptr;
|
| if (!interface_provider_specs->GetDictionary(it.key(), &spec_value)) {
|
| - LOG(ERROR) << "Entry::Deserialize: value of InterfaceProvider map for "
|
| + VLOG(1) << "Entry::Deserialize: value of InterfaceProvider map for "
|
| << "key: " << it.key() << " not a dictionary.";
|
| return nullptr;
|
| }
|
|
|
| service_manager::InterfaceProviderSpec spec;
|
| if (!BuildInterfaceProviderSpec(*spec_value, &spec)) {
|
| - LOG(ERROR) << "Entry::Deserialize: failed to build InterfaceProvider "
|
| + VLOG(1) << "Entry::Deserialize: failed to build InterfaceProvider "
|
| << "spec for key: " << it.key();
|
| return nullptr;
|
| }
|
|
|