Rewrite base::Value::GetType to base::Value::type on Linux
This change replaces usages of base::Value::GetType with
base::Value::type for files compiled on Linux.
Bug: 646113
Change-Id: Idbb142c2f15fdb7a75ffee1d547d5de2129d83b0
Reviewed-on: https://chromium-review.googlesource.com/702456
Reviewed-by: Mike West <[email protected]>
Reviewed-by: Brett Wilson <[email protected]>
Commit-Queue: Jan Wilken Dörrie <[email protected]>
Cr-Commit-Position: refs/heads/master@{#507204}diff --git a/base/json/json_writer.cc b/base/json/json_writer.cc
index 19f28f21..cc4cd28 100644
--- a/base/json/json_writer.cc
+++ b/base/json/json_writer.cc
@@ -56,7 +56,7 @@
}
bool JSONWriter::BuildJSONString(const Value& node, size_t depth) {
- switch (node.GetType()) {
+ switch (node.type()) {
case Value::Type::NONE: {
json_string_->append("null");
return true;
@@ -128,7 +128,7 @@
bool result = node.GetAsList(&list);
DCHECK(result);
for (const auto& value : *list) {
- if (omit_binary_values_ && value.GetType() == Value::Type::BINARY)
+ if (omit_binary_values_ && value.type() == Value::Type::BINARY)
continue;
if (first_value_has_been_output) {
@@ -160,8 +160,7 @@
DCHECK(result);
for (DictionaryValue::Iterator itr(*dict); !itr.IsAtEnd();
itr.Advance()) {
- if (omit_binary_values_ &&
- itr.value().GetType() == Value::Type::BINARY) {
+ if (omit_binary_values_ && itr.value().type() == Value::Type::BINARY) {
continue;
}
diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc
index e61337c..30616a9 100644
--- a/base/test/trace_event_analyzer.cc
+++ b/base/test/trace_event_analyzer.cc
@@ -34,7 +34,7 @@
TraceEvent& TraceEvent::operator=(TraceEvent&& rhs) = default;
bool TraceEvent::SetFromJSON(const base::Value* event_value) {
- if (event_value->GetType() != base::Value::Type::DICTIONARY) {
+ if (event_value->type() != base::Value::Type::DICTIONARY) {
LOG(ERROR) << "Value must be Type::DICTIONARY";
return false;
}
diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc
index ce7bce2..4165f81 100644
--- a/base/test/trace_event_analyzer_unittest.cc
+++ b/base/test/trace_event_analyzer_unittest.cc
@@ -123,7 +123,7 @@
std::unique_ptr<base::Value> arg;
EXPECT_TRUE(event.GetArgAsValue("dict", &arg));
- EXPECT_EQ(base::Value::Type::DICTIONARY, arg->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, arg->type());
}
TEST_F(TraceEventAnalyzerTest, QueryEventMember) {
diff --git a/base/trace_event/trace_event_argument.cc b/base/trace_event/trace_event_argument.cc
index 74dd132..3bca7a9 100644
--- a/base/trace_event/trace_event_argument.cc
+++ b/base/trace_event/trace_event_argument.cc
@@ -246,7 +246,7 @@
void TracedValue::SetBaseValueWithCopiedName(base::StringPiece name,
const base::Value& value) {
DCHECK_CURRENT_CONTAINER_IS(kStackTypeDict);
- switch (value.GetType()) {
+ switch (value.type()) {
case base::Value::Type::NONE:
case base::Value::Type::BINARY:
NOTREACHED();
@@ -300,7 +300,7 @@
void TracedValue::AppendBaseValue(const base::Value& value) {
DCHECK_CURRENT_CONTAINER_IS(kStackTypeArray);
- switch (value.GetType()) {
+ switch (value.type()) {
case base::Value::Type::NONE:
case base::Value::Type::BINARY:
NOTREACHED();
diff --git a/base/trace_event/trace_event_memory_overhead.cc b/base/trace_event/trace_event_memory_overhead.cc
index 02a98bd..bb6edfba 100644
--- a/base/trace_event/trace_event_memory_overhead.cc
+++ b/base/trace_event/trace_event_memory_overhead.cc
@@ -93,7 +93,7 @@
}
void TraceEventMemoryOverhead::AddValue(const Value& value) {
- switch (value.GetType()) {
+ switch (value.type()) {
case Value::Type::NONE:
case Value::Type::BOOLEAN:
case Value::Type::INTEGER:
diff --git a/base/trace_event/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc
index 75251c7..5ef9a3b 100644
--- a/base/trace_event/trace_event_unittest.cc
+++ b/base/trace_event/trace_event_unittest.cc
@@ -264,7 +264,7 @@
for (size_t i = 0; i < trace_parsed_count; i++) {
Value* value = NULL;
trace_parsed_.Get(i, &value);
- if (!value || value->GetType() != Value::Type::DICTIONARY)
+ if (!value || value->type() != Value::Type::DICTIONARY)
continue;
DictionaryValue* dict = static_cast<DictionaryValue*>(value);
@@ -282,7 +282,7 @@
for (size_t i = 0; i < old_trace_parsed_size; i++) {
Value* value = nullptr;
old_trace_parsed->Get(i, &value);
- if (!value || value->GetType() != Value::Type::DICTIONARY) {
+ if (!value || value->type() != Value::Type::DICTIONARY) {
trace_parsed_.Append(value->CreateDeepCopy());
continue;
}
@@ -371,7 +371,7 @@
match_after_this_item = NULL;
continue;
}
- if (!value || value->GetType() != Value::Type::DICTIONARY)
+ if (!value || value->type() != Value::Type::DICTIONARY)
continue;
const DictionaryValue* dict = static_cast<const DictionaryValue*>(value);
@@ -389,7 +389,7 @@
for (size_t i = 0; i < trace_parsed_count; i++) {
const Value* value = NULL;
trace_parsed.Get(i, &value);
- if (!value || value->GetType() != Value::Type::DICTIONARY)
+ if (!value || value->type() != Value::Type::DICTIONARY)
continue;
const DictionaryValue* dict = static_cast<const DictionaryValue*>(value);
@@ -1139,7 +1139,7 @@
for (size_t i = 0; i < trace_parsed_count; i++) {
const Value* value = NULL;
trace_parsed.Get(i, &value);
- if (!value || value->GetType() != Value::Type::DICTIONARY)
+ if (!value || value->type() != Value::Type::DICTIONARY)
continue;
const DictionaryValue* dict = static_cast<const DictionaryValue*>(value);
std::string name;
diff --git a/base/values.cc b/base/values.cc
index 87db3d9..734f39d 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -58,7 +58,7 @@
}
std::unique_ptr<Value> CopyWithoutEmptyChildren(const Value& node) {
- switch (node.GetType()) {
+ switch (node.type()) {
case Value::Type::LIST:
return CopyListWithoutEmptyChildren(static_cast<const ListValue&>(node));
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 2281279..0816e82 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -1010,7 +1010,7 @@
EXPECT_FALSE(dict.Get("this.isnt.expanded", &value3));
Value* value4;
ASSERT_TRUE(dict.GetWithoutPathExpansion("this.isnt.expanded", &value4));
- EXPECT_EQ(Value::Type::NONE, value4->GetType());
+ EXPECT_EQ(Value::Type::NONE, value4->type());
}
// Tests the deprecated version of SetWithoutPathExpansion.
@@ -1034,7 +1034,7 @@
EXPECT_FALSE(dict.Get("this.isnt.expanded", &value3));
Value* value4;
ASSERT_TRUE(dict.GetWithoutPathExpansion("this.isnt.expanded", &value4));
- EXPECT_EQ(Value::Type::NONE, value4->GetType());
+ EXPECT_EQ(Value::Type::NONE, value4->type());
}
TEST(ValuesTest, DictionaryRemovePath) {
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 7583c88..492caff 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -112,10 +112,10 @@
base::Value* roots = NULL;
if (!Write(kHeader) ||
- bookmarks_->GetType() != base::Value::Type::DICTIONARY ||
- !static_cast<base::DictionaryValue*>(bookmarks_.get())->Get(
- BookmarkCodec::kRootsKey, &roots) ||
- roots->GetType() != base::Value::Type::DICTIONARY) {
+ bookmarks_->type() != base::Value::Type::DICTIONARY ||
+ !static_cast<base::DictionaryValue*>(bookmarks_.get())
+ ->Get(BookmarkCodec::kRootsKey, &roots) ||
+ roots->type() != base::Value::Type::DICTIONARY) {
NOTREACHED();
return;
}
@@ -127,13 +127,13 @@
base::Value* mobile_folder_value = NULL;
if (!roots_d_value->Get(BookmarkCodec::kRootFolderNameKey,
&root_folder_value) ||
- root_folder_value->GetType() != base::Value::Type::DICTIONARY ||
+ root_folder_value->type() != base::Value::Type::DICTIONARY ||
!roots_d_value->Get(BookmarkCodec::kOtherBookmarkFolderNameKey,
&other_folder_value) ||
- other_folder_value->GetType() != base::Value::Type::DICTIONARY ||
+ other_folder_value->type() != base::Value::Type::DICTIONARY ||
!roots_d_value->Get(BookmarkCodec::kMobileBookmarkFolderNameKey,
&mobile_folder_value) ||
- mobile_folder_value->GetType() != base::Value::Type::DICTIONARY) {
+ mobile_folder_value->type() != base::Value::Type::DICTIONARY) {
NOTREACHED();
return; // Invalid type for root folder and/or other folder.
}
@@ -305,7 +305,7 @@
if (!value.GetString(BookmarkCodec::kDateModifiedKey,
&last_modified_date) ||
!value.Get(BookmarkCodec::kChildrenKey, &child_values) ||
- child_values->GetType() != base::Value::Type::LIST) {
+ child_values->type() != base::Value::Type::LIST) {
NOTREACHED();
return false;
}
@@ -345,7 +345,7 @@
for (size_t i = 0; i < children->GetSize(); ++i) {
const base::Value* child_value;
if (!children->Get(i, &child_value) ||
- child_value->GetType() != base::Value::Type::DICTIONARY) {
+ child_value->type() != base::Value::Type::DICTIONARY) {
NOTREACHED();
return false;
}
diff --git a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
index 27990e8..7c02a3e 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
@@ -273,7 +273,7 @@
&provider, google_url, google_url,
CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, std::string(), false));
- ASSERT_EQ(base::Value::Type::DICTIONARY, cert_filter->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, cert_filter->type());
base::DictionaryValue* dict_value =
static_cast<base::DictionaryValue*>(cert_filter.get());
std::string actual_common_name;
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 003280a..9fb58bf 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -1283,7 +1283,7 @@
void DevToolsWindow::ShowCertificateViewer(const std::string& cert_chain) {
std::unique_ptr<base::Value> value = base::JSONReader::Read(cert_chain);
- if (!value || value->GetType() != base::Value::Type::LIST) {
+ if (!value || value->type() != base::Value::Type::LIST) {
NOTREACHED();
return;
}
@@ -1293,7 +1293,7 @@
std::vector<std::string> decoded;
for (size_t i = 0; i < list->GetSize(); ++i) {
base::Value* item;
- if (!list->Get(i, &item) || item->GetType() != base::Value::Type::STRING) {
+ if (!list->Get(i, &item) || item->type() != base::Value::Type::STRING) {
NOTREACHED();
return;
}
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
index 577edb34..b15802be 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
@@ -358,7 +358,7 @@
if (!args_->Get(0, &first_arg))
return true;
- switch (first_arg->GetType()) {
+ switch (first_arg->type()) {
case base::Value::Type::INTEGER:
CHECK(first_arg->GetAsInteger(&tab_id_));
break;
@@ -369,7 +369,7 @@
// Still need to check for the tabId within details.
base::Value* tab_id_value = NULL;
if (details_->Get("tabId", &tab_id_value)) {
- switch (tab_id_value->GetType()) {
+ switch (tab_id_value->type()) {
case base::Value::Type::NONE:
// OK; tabId is optional, leave it default.
return true;
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
index c8fddb5..c9a3996 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -576,7 +576,7 @@
if (info.get())
msg << info->id << " ";
else
- msg << result << "<-" << result.GetType() << " ";
+ msg << result << "<-" << result.type() << " ";
}
}
diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
index 67409dc..49cc0e4 100644
--- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
@@ -322,7 +322,7 @@
std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
notification_function.get(), "[]", browser(), utils::NONE));
- EXPECT_EQ(base::Value::Type::STRING, result->GetType());
+ EXPECT_EQ(base::Value::Type::STRING, result->type());
std::string permission_level;
EXPECT_TRUE(result->GetAsString(&permission_level));
EXPECT_EQ("granted", permission_level);
@@ -345,7 +345,7 @@
std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
notification_function.get(), "[]", browser(), utils::NONE));
- EXPECT_EQ(base::Value::Type::STRING, result->GetType());
+ EXPECT_EQ(base::Value::Type::STRING, result->type());
std::string permission_level;
EXPECT_TRUE(result->GetAsString(&permission_level));
EXPECT_EQ("denied", permission_level);
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index c16442b8..fed426f 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -765,7 +765,7 @@
EXTENSION_FUNCTION_VALIDATE(!bad_message);
return RespondNow(Error(error));
}
- EXTENSION_FUNCTION_VALIDATE(browser_pref_value->GetType() == pref->GetType());
+ EXTENSION_FUNCTION_VALIDATE(browser_pref_value->type() == pref->GetType());
// Validate also that the stored value can be converted back by the
// transformer.
diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc
index a761f6b..f5034857 100644
--- a/chrome/browser/extensions/api/tabs/tabs_test.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_test.cc
@@ -1189,7 +1189,7 @@
int duplicate_tab_window_id = GetTabWindowId(duplicate_result.get());
int duplicate_tab_index =
api_test_utils::GetInteger(duplicate_result.get(), "index");
- EXPECT_EQ(base::Value::Type::DICTIONARY, duplicate_result->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, duplicate_result->type());
// Duplicate tab id should be different from the original tab id.
EXPECT_NE(tab_id, duplicate_tab_id);
EXPECT_EQ(window_id, duplicate_tab_window_id);
@@ -1226,7 +1226,7 @@
int duplicate_tab_window_id = GetTabWindowId(duplicate_result.get());
int duplicate_tab_index =
api_test_utils::GetInteger(duplicate_result.get(), "index");
- EXPECT_EQ(base::Value::Type::DICTIONARY, duplicate_result->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, duplicate_result->type());
// Duplicate tab id should be different from the original tab id.
EXPECT_NE(tab_id, duplicate_tab_id);
EXPECT_EQ(window_id, duplicate_tab_window_id);
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index ff0476c..d57c415 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -601,7 +601,7 @@
std::unique_ptr<const base::Value> form_data =
base::JSONReader::Read(kFormData);
ASSERT_TRUE(form_data.get() != NULL);
- ASSERT_TRUE(form_data->GetType() == base::Value::Type::DICTIONARY);
+ ASSERT_TRUE(form_data->type() == base::Value::Type::DICTIONARY);
// Contents of raw.
base::ListValue raw;
extensions::subtle::AppendKeyValuePair(
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
index cb708ab..6c441e1 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -399,7 +399,7 @@
std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
function.get(), kEmptyArgs, browser()));
ASSERT_TRUE(result);
- EXPECT_EQ(base::Value::Type::STRING, result->GetType());
+ EXPECT_EQ(base::Value::Type::STRING, result->type());
std::string webgl_status;
EXPECT_TRUE(result->GetAsString(&webgl_status));
EXPECT_STREQ(webgl_allowed ? kWebGLStatusAllowed : kWebGLStatusBlocked,
diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc
index 2670e8e..b22aeb7d 100644
--- a/chrome/browser/extensions/extension_function_test_utils.cc
+++ b/chrome/browser/extensions/extension_function_test_utils.cc
@@ -59,13 +59,13 @@
base::DictionaryValue* ToDictionary(base::Value* val) {
EXPECT_TRUE(val);
- EXPECT_EQ(base::Value::Type::DICTIONARY, val->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, val->type());
return static_cast<base::DictionaryValue*>(val);
}
base::ListValue* ToList(base::Value* val) {
EXPECT_TRUE(val);
- EXPECT_EQ(base::Value::Type::LIST, val->GetType());
+ EXPECT_EQ(base::Value::Type::LIST, val->type());
return static_cast<base::ListValue*>(val);
}
diff --git a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
index c7d566b7..81cdd55 100644
--- a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
@@ -411,7 +411,7 @@
if (request.content.find("redirect_chain") != std::string::npos) {
std::unique_ptr<base::Value> contents =
base::JSONReader::Read(request.content);
- ASSERT_EQ(base::Value::Type::DICTIONARY, contents->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, contents->type());
cws_request_json_data_ = base::DictionaryValue::From(std::move(contents));
}
}
diff --git a/chrome/browser/media/webrtc/webrtc_getmediadevices_browsertest.cc b/chrome/browser/media/webrtc/webrtc_getmediadevices_browsertest.cc
index 861af64..3f51983 100644
--- a/chrome/browser/media/webrtc/webrtc_getmediadevices_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_getmediadevices_browsertest.cc
@@ -75,7 +75,7 @@
&error_message);
ASSERT_TRUE(value.get() != NULL) << error_message;
- EXPECT_EQ(value->GetType(), base::Value::Type::LIST);
+ EXPECT_EQ(value->type(), base::Value::Type::LIST);
base::ListValue* values;
ASSERT_TRUE(value->GetAsList(&values));
diff --git a/chrome/browser/net/referrer.cc b/chrome/browser/net/referrer.cc
index e73057f..e901db4 100644
--- a/chrome/browser/net/referrer.cc
+++ b/chrome/browser/net/referrer.cc
@@ -109,7 +109,7 @@
}
void Referrer::Deserialize(const base::Value& value) {
- if (value.GetType() != base::Value::Type::LIST)
+ if (value.type() != base::Value::Type::LIST)
return;
const base::ListValue* subresource_list(
static_cast<const base::ListValue*>(&value));
diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc
index 6c9261e..55af7c81 100644
--- a/chrome/browser/plugins/plugin_finder.cc
+++ b/chrome/browser/plugins/plugin_finder.cc
@@ -225,7 +225,7 @@
return nullptr;
}
- if (value->GetType() != base::Value::Type::DICTIONARY) {
+ if (value->type() != base::Value::Type::DICTIONARY) {
// JSONReader::JSON_PARSE_ERROR_COUNT is used for the case where the JSON
// value has the wrong type.
RecordBuiltInPluginListError(PluginListError::SCHEMA_ERROR);
diff --git a/chrome/browser/plugins/plugin_finder_unittest.cc b/chrome/browser/plugins/plugin_finder_unittest.cc
index d906f06..6030171 100644
--- a/chrome/browser/plugins/plugin_finder_unittest.cc
+++ b/chrome/browser/plugins/plugin_finder_unittest.cc
@@ -17,7 +17,7 @@
ASSERT_TRUE(plugin_list.get());
std::unique_ptr<base::Value> version;
ASSERT_TRUE(plugin_list->Remove("x-version", &version));
- EXPECT_EQ(base::Value::Type::INTEGER, version->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, version->type());
for (base::DictionaryValue::Iterator plugin_it(*plugin_list);
!plugin_it.IsAtEnd(); plugin_it.Advance()) {
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index b60fa25..b3181c487 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -484,7 +484,7 @@
content::ExecuteScriptAndGetValue(contents->GetMainFrame(), "123");
int result = 0;
if (!value->GetAsInteger(&result))
- EXPECT_EQ(base::Value::Type::NONE, value->GetType());
+ EXPECT_EQ(base::Value::Type::NONE, value->type());
return result == 123;
}
diff --git a/chrome/browser/prefs/chrome_command_line_pref_store_unittest.cc b/chrome/browser/prefs/chrome_command_line_pref_store_unittest.cc
index a558c093..fcb9985 100644
--- a/chrome/browser/prefs/chrome_command_line_pref_store_unittest.cc
+++ b/chrome/browser/prefs/chrome_command_line_pref_store_unittest.cc
@@ -38,7 +38,7 @@
void VerifyProxyMode(ProxyPrefs::ProxyMode expected_mode) {
const base::Value* value = NULL;
ASSERT_TRUE(GetValue(proxy_config::prefs::kProxy, &value));
- ASSERT_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, value->type());
ProxyConfigDictionary dict(
static_cast<const base::DictionaryValue*>(value)->CreateDeepCopy());
ProxyPrefs::ProxyMode actual_mode;
@@ -50,7 +50,7 @@
size_t cipher_count) {
const base::Value* value = NULL;
ASSERT_TRUE(GetValue(ssl_config::prefs::kCipherSuiteBlacklist, &value));
- ASSERT_EQ(base::Value::Type::LIST, value->GetType());
+ ASSERT_EQ(base::Value::Type::LIST, value->type());
const base::ListValue* list_value =
static_cast<const base::ListValue*>(value);
ASSERT_EQ(cipher_count, list_value->GetSize());
@@ -122,7 +122,7 @@
const base::Value* value = NULL;
ASSERT_TRUE(store->GetValue(proxy_config::prefs::kProxy, &value));
- ASSERT_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, value->type());
ProxyConfigDictionary dict(
static_cast<const base::DictionaryValue*>(value)->CreateDeepCopy());
diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc
index 512017a..c89dc7e 100644
--- a/chrome/browser/prefs/chrome_pref_service_unittest.cc
+++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc
@@ -28,7 +28,7 @@
ASSERT_TRUE(pref);
const base::Value* value = pref->GetValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::BOOLEAN, value->GetType());
+ EXPECT_EQ(base::Value::Type::BOOLEAN, value->type());
bool actual_bool_value = true;
EXPECT_TRUE(value->GetAsBoolean(&actual_bool_value));
EXPECT_FALSE(actual_bool_value);
@@ -43,7 +43,7 @@
ASSERT_TRUE(pref);
value = pref->GetValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::BOOLEAN, value->GetType());
+ EXPECT_EQ(base::Value::Type::BOOLEAN, value->type());
actual_bool_value = false;
EXPECT_TRUE(value->GetAsBoolean(&actual_bool_value));
EXPECT_TRUE(actual_bool_value);
diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc
index 9ca5da7..9e81ad0 100644
--- a/chrome/browser/ui/page_info/page_info.cc
+++ b/chrome/browser/ui/page_info/page_info.cc
@@ -772,7 +772,7 @@
std::unique_ptr<base::Value> value = content_settings_->GetWebsiteSetting(
site_url_, site_url_, permission_info.type, std::string(), &info);
DCHECK(value.get());
- if (value->GetType() == base::Value::Type::INTEGER) {
+ if (value->type() == base::Value::Type::INTEGER) {
permission_info.setting =
content_settings::ValueToContentSetting(value.get());
} else {
diff --git a/chrome/browser/ui/webui/certificates_handler.cc b/chrome/browser/ui/webui/certificates_handler.cc
index d063db3..85d20c1 100644
--- a/chrome/browser/ui/webui/certificates_handler.cc
+++ b/chrome/browser/ui/webui/certificates_handler.cc
@@ -88,8 +88,8 @@
: collator_(collator) {}
bool operator()(const base::Value& a, const base::Value& b) const {
- DCHECK(a.GetType() == base::Value::Type::DICTIONARY);
- DCHECK(b.GetType() == base::Value::Type::DICTIONARY);
+ DCHECK(a.type() == base::Value::Type::DICTIONARY);
+ DCHECK(b.type() == base::Value::Type::DICTIONARY);
const base::DictionaryValue* a_dict;
bool a_is_dictionary = a.GetAsDictionary(&a_dict);
DCHECK(a_is_dictionary);
diff --git a/chrome/browser/ui/webui/site_settings_helper.cc b/chrome/browser/ui/webui/site_settings_helper.cc
index b776b0b..2b5cd10 100644
--- a/chrome/browser/ui/webui/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/site_settings_helper.cc
@@ -426,7 +426,7 @@
content_type, origin, origin);
} else {
DCHECK(value.get());
- DCHECK_EQ(base::Value::Type::INTEGER, value->GetType());
+ DCHECK_EQ(base::Value::Type::INTEGER, value->type());
result.content_setting =
content_settings::ValueToContentSetting(value.get());
}
diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
index 830c551..469641e 100644
--- a/components/bookmarks/browser/bookmark_codec.cc
+++ b/components/bookmarks/browser/bookmark_codec.cc
@@ -177,7 +177,7 @@
const base::Value* checksum_value;
if (d_value->Get(kChecksumKey, &checksum_value)) {
- if (checksum_value->GetType() != base::Value::Type::STRING)
+ if (checksum_value->type() != base::Value::Type::STRING)
return false;
if (!checksum_value->GetAsString(&stored_checksum_))
return false;
@@ -333,7 +333,7 @@
if (!value.Get(kChildrenKey, &child_values))
return false;
- if (child_values->GetType() != base::Value::Type::LIST)
+ if (child_values->type() != base::Value::Type::LIST)
return false;
if (!node) {
diff --git a/components/bookmarks/browser/bookmark_codec_unittest.cc b/components/bookmarks/browser/bookmark_codec_unittest.cc
index a9d8523..3a6a282e 100644
--- a/components/bookmarks/browser/bookmark_codec_unittest.cc
+++ b/components/bookmarks/browser/bookmark_codec_unittest.cc
@@ -114,33 +114,33 @@
void GetBookmarksBarChildValue(base::Value* value,
size_t index,
base::DictionaryValue** result_value) {
- ASSERT_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, value->type());
base::DictionaryValue* d_value = nullptr;
value->GetAsDictionary(&d_value);
base::Value* roots;
ASSERT_TRUE(d_value->Get(BookmarkCodec::kRootsKey, &roots));
- ASSERT_EQ(base::Value::Type::DICTIONARY, roots->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, roots->type());
base::DictionaryValue* roots_d_value = nullptr;
roots->GetAsDictionary(&roots_d_value);
base::Value* bb_value;
ASSERT_TRUE(
roots_d_value->Get(BookmarkCodec::kRootFolderNameKey, &bb_value));
- ASSERT_EQ(base::Value::Type::DICTIONARY, bb_value->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, bb_value->type());
base::DictionaryValue* bb_d_value = nullptr;
bb_value->GetAsDictionary(&bb_d_value);
base::Value* bb_children_value;
ASSERT_TRUE(
bb_d_value->Get(BookmarkCodec::kChildrenKey, &bb_children_value));
- ASSERT_EQ(base::Value::Type::LIST, bb_children_value->GetType());
+ ASSERT_EQ(base::Value::Type::LIST, bb_children_value->type());
base::ListValue* bb_children_l_value = nullptr;
bb_children_value->GetAsList(&bb_children_l_value);
base::Value* child_value;
ASSERT_TRUE(bb_children_l_value->Get(index, &child_value));
- ASSERT_EQ(base::Value::Type::DICTIONARY, child_value->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, child_value->type());
child_value->GetAsDictionary(result_value);
}
diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc
index 8c53fe4..e791367 100644
--- a/components/content_settings/core/browser/content_settings_pref.cc
+++ b/components/content_settings/core/browser/content_settings_pref.cc
@@ -54,7 +54,7 @@
// TODO(raymes): We should permit different types of base::Value for
// website settings.
- return value->GetType() == base::Value::Type::DICTIONARY;
+ return value->type() == base::Value::Type::DICTIONARY;
}
// Extract a timestamp from |dictionary[kLastModifiedPath]|.
diff --git a/components/drive/service/fake_drive_service.cc b/components/drive/service/fake_drive_service.cc
index 2997101..d067c9c8 100644
--- a/components/drive/service/fake_drive_service.cc
+++ b/components/drive/service/fake_drive_service.cc
@@ -268,7 +268,7 @@
// Load JSON data, which must be a dictionary.
std::unique_ptr<base::Value> value = test_util::LoadJSONFile(relative_path);
- CHECK_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ CHECK_EQ(base::Value::Type::DICTIONARY, value->type());
app_info_value_.reset(
static_cast<base::DictionaryValue*>(value.release()));
return !!app_info_value_;
@@ -296,7 +296,7 @@
JSONStringValueDeserializer json(app_json);
std::string error_message;
std::unique_ptr<base::Value> value(json.Deserialize(NULL, &error_message));
- CHECK_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ CHECK_EQ(base::Value::Type::DICTIONARY, value->type());
base::ListValue* item_list;
CHECK(app_info_value_->GetListWithoutPathExpansion("items", &item_list));
diff --git a/components/json_schema/json_schema_validator.cc b/components/json_schema/json_schema_validator.cc
index 038b66d..21f09509 100644
--- a/components/json_schema/json_schema_validator.cc
+++ b/components/json_schema/json_schema_validator.cc
@@ -29,7 +29,7 @@
double GetNumberValue(const base::Value* value) {
double result = 0;
CHECK(value->GetAsDouble(&result))
- << "Unexpected value type: " << value->GetType();
+ << "Unexpected value type: " << value->type();
return result;
}
@@ -107,7 +107,7 @@
for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
// Validate the "type" attribute, which may be a string or a list.
if (it.key() == schema::kType) {
- switch (it.value().GetType()) {
+ switch (it.value().type()) {
case base::Value::Type::STRING:
it.value().GetAsString(&string_value);
if (!IsValidType(string_value)) {
@@ -249,7 +249,7 @@
*error = "Invalid value in enum attribute";
return false;
}
- switch (value->GetType()) {
+ switch (value->type()) {
case base::Value::Type::NONE:
case base::Value::Type::BOOLEAN:
case base::Value::Type::INTEGER:
@@ -342,7 +342,7 @@
// static
std::string JSONSchemaValidator::GetJSONSchemaType(const base::Value* value) {
- switch (value->GetType()) {
+ switch (value->type()) {
case base::Value::Type::NONE:
return schema::kNull;
case base::Value::Type::BOOLEAN:
@@ -366,7 +366,7 @@
case base::Value::Type::LIST:
return schema::kArray;
default:
- NOTREACHED() << "Unexpected value type: " << value->GetType();
+ NOTREACHED() << "Unexpected value type: " << value->type();
return std::string();
}
}
@@ -553,7 +553,7 @@
if (!choice) {
NOTREACHED();
}
- switch (choice->GetType()) {
+ switch (choice->type()) {
case base::Value::Type::NONE:
case base::Value::Type::BOOLEAN:
case base::Value::Type::STRING:
@@ -571,7 +571,7 @@
break;
default:
- NOTREACHED() << "Unexpected type in enum: " << choice->GetType();
+ NOTREACHED() << "Unexpected type in enum: " << choice->type();
}
}
@@ -715,7 +715,7 @@
CHECK(tuple_type->GetDictionary(i, &item_schema));
const base::Value* item_value = NULL;
instance->Get(i, &item_value);
- if (item_value && item_value->GetType() != base::Value::Type::NONE) {
+ if (item_value && item_value->type() != base::Value::Type::NONE) {
Validate(item_value, item_schema, item_path);
} else {
bool is_optional = false;
diff --git a/components/json_schema/json_schema_validator_unittest_base.cc b/components/json_schema/json_schema_validator_unittest_base.cc
index 2b03abe..43d292b4 100644
--- a/components/json_schema/json_schema_validator_unittest_base.cc
+++ b/components/json_schema/json_schema_validator_unittest_base.cc
@@ -50,7 +50,7 @@
if (!result.get())
return NULL;
if (!result->IsType(type)) {
- ADD_FAILURE() << "Expected type " << type << ", got: " << result->GetType();
+ ADD_FAILURE() << "Expected type " << type << ", got: " << result->type();
return NULL;
}
return result.release();
diff --git a/components/policy/core/browser/configuration_policy_handler.cc b/components/policy/core/browser/configuration_policy_handler.cc
index 8d0fcfbb..497f8816 100644
--- a/components/policy/core/browser/configuration_policy_handler.cc
+++ b/components/policy/core/browser/configuration_policy_handler.cc
@@ -118,7 +118,7 @@
*filtered_list = base::MakeUnique<base::ListValue>();
for (size_t list_index = 0; list_index < list.size(); ++list_index) {
const base::Value& entry = list[list_index];
- if (entry.GetType() != list_entry_type_) {
+ if (entry.type() != list_entry_type_) {
if (errors) {
errors->AddError(policy_name(), list_index, IDS_POLICY_TYPE_ERROR,
base::Value::GetTypeName(list_entry_type_));
diff --git a/components/policy/core/browser/proxy_policy_handler_unittest.cc b/components/policy/core/browser/proxy_policy_handler_unittest.cc
index 76ea708..3207129 100644
--- a/components/policy/core/browser/proxy_policy_handler_unittest.cc
+++ b/components/policy/core/browser/proxy_policy_handler_unittest.cc
@@ -46,7 +46,7 @@
const ProxyPrefs::ProxyMode& expected_proxy_mode) {
const base::Value* value = NULL;
ASSERT_TRUE(store_->GetValue(proxy_config::prefs::kProxy, &value));
- ASSERT_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, value->type());
ProxyConfigDictionary dict(
static_cast<const base::DictionaryValue*>(value)->CreateDeepCopy());
std::string s;
diff --git a/components/prefs/pref_registry.cc b/components/prefs/pref_registry.cc
index ccc4a37..9edde709 100644
--- a/components/prefs/pref_registry.cc
+++ b/components/prefs/pref_registry.cc
@@ -46,7 +46,7 @@
const base::Value* current_value = NULL;
DCHECK(defaults_->GetValue(pref_name, ¤t_value))
<< "Setting default for unregistered pref: " << pref_name;
- DCHECK(value->IsType(current_value->GetType()))
+ DCHECK(value->IsType(current_value->type()))
<< "Wrong type for new default: " << pref_name;
defaults_->ReplaceDefaultValue(pref_name, base::WrapUnique(value));
@@ -65,7 +65,7 @@
const std::string& path,
std::unique_ptr<base::Value> default_value,
uint32_t flags) {
- base::Value::Type orig_type = default_value->GetType();
+ base::Value::Type orig_type = default_value->type();
DCHECK(orig_type != base::Value::Type::NONE &&
orig_type != base::Value::Type::BINARY) <<
"invalid preference type: " << orig_type;
diff --git a/components/prefs/pref_service.cc b/components/prefs/pref_service.cc
index 7d69b64..c30c6a8 100644
--- a/components/prefs/pref_service.cc
+++ b/components/prefs/pref_service.cc
@@ -231,9 +231,10 @@
const base::Value* default_value = NULL;
if (!pref_registry_->defaults()->GetValue(pref_name, &default_value))
return NULL;
- it = prefs_map_.insert(
- std::make_pair(pref_name, Preference(
- this, pref_name, default_value->GetType()))).first;
+ it = prefs_map_
+ .insert(std::make_pair(
+ pref_name, Preference(this, pref_name, default_value->type())))
+ .first;
return &(it->second);
}
@@ -290,7 +291,7 @@
NOTREACHED() << "Trying to read an unregistered pref: " << path;
return NULL;
}
- if (value->GetType() != base::Value::Type::DICTIONARY) {
+ if (value->type() != base::Value::Type::DICTIONARY) {
NOTREACHED();
return NULL;
}
@@ -347,7 +348,7 @@
NOTREACHED() << "Trying to read an unregistered pref: " << path;
return NULL;
}
- if (value->GetType() != base::Value::Type::LIST) {
+ if (value->type() != base::Value::Type::LIST) {
NOTREACHED();
return NULL;
}
@@ -523,10 +524,10 @@
NOTREACHED() << "Trying to write an unregistered pref: " << path;
return;
}
- if (pref->GetType() != new_value->GetType()) {
- NOTREACHED() << "Trying to set pref " << path
- << " of type " << pref->GetType()
- << " to value of type " << new_value->GetType();
+ if (pref->GetType() != new_value->type()) {
+ NOTREACHED() << "Trying to set pref " << path << " of type "
+ << pref->GetType() << " to value of type "
+ << new_value->type();
return;
}
@@ -632,7 +633,7 @@
const base::Value* default_value = NULL;
if (pref_registry_->defaults()->GetValue(path, &default_value)) {
const base::Value* found_value = NULL;
- base::Value::Type default_type = default_value->GetType();
+ base::Value::Type default_type = default_value->type();
if (pref_value_store_->GetValue(path, default_type, &found_value)) {
DCHECK(found_value->IsType(default_type));
return found_value;
diff --git a/components/prefs/pref_service_unittest.cc b/components/prefs/pref_service_unittest.cc
index b64ddad9..2776fbf 100644
--- a/components/prefs/pref_service_unittest.cc
+++ b/components/prefs/pref_service_unittest.cc
@@ -148,7 +148,7 @@
ASSERT_TRUE(pref);
const base::Value* value = pref->GetValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, value->type());
int actual_int_value = -1;
EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
EXPECT_EQ(kTestValue, actual_int_value);
@@ -168,7 +168,7 @@
// Check that GetValue() returns the default value.
const base::Value* value = pref->GetValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, value->type());
int actual_int_value = -1;
EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
EXPECT_EQ(kDefaultValue, actual_int_value);
@@ -183,7 +183,7 @@
// Check that GetValue() returns the user-set value.
value = pref->GetValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, value->type());
actual_int_value = -1;
EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
EXPECT_EQ(kUserValue, actual_int_value);
@@ -199,7 +199,7 @@
// Check that GetValue() returns the user-set value.
value = pref->GetValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, value->type());
actual_int_value = -1;
EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
EXPECT_EQ(kUserValue, actual_int_value);
@@ -207,7 +207,7 @@
// Check that GetRecommendedValue() returns the recommended value.
value = pref->GetRecommendedValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, value->type());
actual_int_value = -1;
EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
EXPECT_EQ(kRecommendedValue, actual_int_value);
@@ -218,7 +218,7 @@
// Check that GetValue() returns the recommended value.
value = pref->GetValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, value->type());
actual_int_value = -1;
EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
EXPECT_EQ(kRecommendedValue, actual_int_value);
@@ -226,7 +226,7 @@
// Check that GetRecommendedValue() returns the recommended value.
value = pref->GetRecommendedValue();
ASSERT_TRUE(value);
- EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, value->type());
actual_int_value = -1;
EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
EXPECT_EQ(kRecommendedValue, actual_int_value);
diff --git a/components/prefs/pref_value_store.cc b/components/prefs/pref_value_store.cc
index f76d3a5..490fc4f 100644
--- a/components/prefs/pref_value_store.cc
+++ b/components/prefs/pref_value_store.cc
@@ -267,8 +267,8 @@
return true;
LOG(WARNING) << "Expected type for " << name << " is " << type
- << " but got " << (*out_value)->GetType()
- << " in store " << store;
+ << " but got " << (*out_value)->type() << " in store "
+ << store;
}
*out_value = NULL;
diff --git a/components/safe_json/json_sanitizer.cc b/components/safe_json/json_sanitizer.cc
index c88dd883..b98283f 100644
--- a/components/safe_json/json_sanitizer.cc
+++ b/components/safe_json/json_sanitizer.cc
@@ -60,7 +60,7 @@
// A valid JSON document may only have a dictionary or list as its top-level
// type, but the JSON parser also accepts other types, so we filter them out.
- base::Value::Type type = value->GetType();
+ base::Value::Type type = value->type();
if (type != base::Value::Type::DICTIONARY &&
type != base::Value::Type::LIST) {
error_callback_.Run("Invalid top-level type");
diff --git a/components/sync/syncable/model_type.cc b/components/sync/syncable/model_type.cc
index d97d6b8..0bb036d9 100644
--- a/components/sync/syncable/model_type.cc
+++ b/components/sync/syncable/model_type.cc
@@ -505,7 +505,7 @@
CHECK(value.GetAsInteger(&result));
return ModelTypeFromInt(result);
} else {
- NOTREACHED() << "Unsupported value type: " << value.GetType();
+ NOTREACHED() << "Unsupported value type: " << value.type();
return UNSPECIFIED;
}
}
diff --git a/components/sync_preferences/pref_model_associator.cc b/components/sync_preferences/pref_model_associator.cc
index 52e09d0..91bbd650 100644
--- a/components/sync_preferences/pref_model_associator.cc
+++ b/components/sync_preferences/pref_model_associator.cc
@@ -106,11 +106,11 @@
if (new_value->IsType(base::Value::Type::NONE)) {
LOG(WARNING) << "Sync has null value for pref " << pref_name.c_str();
pref_service_->ClearPref(pref_name);
- } else if (!new_value->IsType(user_pref_value->GetType())) {
+ } else if (!new_value->IsType(user_pref_value->type())) {
LOG(WARNING) << "Synced value for " << preference.name()
- << " is of type " << new_value->GetType()
+ << " is of type " << new_value->type()
<< " which doesn't match pref type "
- << user_pref_value->GetType();
+ << user_pref_value->type();
} else if (!user_pref_value->Equals(new_value.get())) {
pref_service_->Set(pref_name, *new_value);
}
@@ -282,13 +282,13 @@
std::unique_ptr<base::Value> PrefModelAssociator::MergeListValues(
const base::Value& from_value,
const base::Value& to_value) {
- if (from_value.GetType() == base::Value::Type::NONE)
+ if (from_value.type() == base::Value::Type::NONE)
return base::MakeUnique<base::Value>(to_value.Clone());
- if (to_value.GetType() == base::Value::Type::NONE)
+ if (to_value.type() == base::Value::Type::NONE)
return base::MakeUnique<base::Value>(from_value.Clone());
- DCHECK(from_value.GetType() == base::Value::Type::LIST);
- DCHECK(to_value.GetType() == base::Value::Type::LIST);
+ DCHECK(from_value.type() == base::Value::Type::LIST);
+ DCHECK(to_value.type() == base::Value::Type::LIST);
base::Value result = to_value.Clone();
base::Value::ListStorage& list = result.GetList();
diff --git a/content/browser/accessibility/accessibility_tree_formatter_blink.cc b/content/browser/accessibility/accessibility_tree_formatter_blink.cc
index d4d9d34b..6a87eb36 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_blink.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_blink.cc
@@ -383,7 +383,7 @@
if (!dict.Get(attribute_name, &value))
continue;
- switch (value->GetType()) {
+ switch (value->type()) {
case base::Value::Type::STRING: {
std::string string_value;
value->GetAsString(&string_value);
diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
index ff7337e..78a14dd1 100644
--- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
@@ -239,7 +239,7 @@
&error_message);
ASSERT_TRUE(value.get() != NULL) << error_message;
- EXPECT_EQ(value->GetType(), base::Value::Type::LIST);
+ EXPECT_EQ(value->type(), base::Value::Type::LIST);
base::ListValue* values;
ASSERT_TRUE(value->GetAsList(&values));
diff --git a/content/browser/webrtc/webrtc_internals_browsertest.cc b/content/browser/webrtc/webrtc_internals_browsertest.cc
index c3fcbd5..b3f0c1b4 100644
--- a/content/browser/webrtc/webrtc_internals_browsertest.cc
+++ b/content/browser/webrtc/webrtc_internals_browsertest.cc
@@ -239,7 +239,7 @@
std::unique_ptr<base::Value> value_requests =
base::JSONReader::Read(json_requests);
- EXPECT_EQ(base::Value::Type::LIST, value_requests->GetType());
+ EXPECT_EQ(base::Value::Type::LIST, value_requests->type());
base::ListValue* list_request =
static_cast<base::ListValue*>(value_requests.get());
@@ -439,7 +439,7 @@
int update_number,
int stats_number) {
EXPECT_NE((base::Value*)NULL, dump);
- EXPECT_EQ(base::Value::Type::DICTIONARY, dump->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, dump->type());
base::DictionaryValue* dict_dump =
static_cast<base::DictionaryValue*>(dump);
@@ -449,7 +449,7 @@
for (; !it.IsAtEnd(); it.Advance()) {
base::Value* value = NULL;
dict_dump->Get(it.key(), &value);
- EXPECT_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, value->type());
base::DictionaryValue* pc_dump =
static_cast<base::DictionaryValue*>(value);
EXPECT_TRUE(pc_dump->HasKey("updateLog"));
@@ -457,13 +457,13 @@
// Verifies the number of updates.
pc_dump->Get("updateLog", &value);
- EXPECT_EQ(base::Value::Type::LIST, value->GetType());
+ EXPECT_EQ(base::Value::Type::LIST, value->type());
base::ListValue* list = static_cast<base::ListValue*>(value);
EXPECT_EQ((size_t) update_number, list->GetSize());
// Verifies the number of stats tables.
pc_dump->Get("stats", &value);
- EXPECT_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, value->type());
base::DictionaryValue* dict = static_cast<base::DictionaryValue*>(value);
EXPECT_EQ((size_t) stats_number, dict->size());
}
@@ -477,7 +477,7 @@
const string& report_id,
const StatsUnit& stats) {
EXPECT_NE((base::Value*)NULL, dump);
- EXPECT_EQ(base::Value::Type::DICTIONARY, dump->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, dump->type());
base::DictionaryValue* dict_dump =
static_cast<base::DictionaryValue*>(dump);
@@ -488,7 +488,7 @@
// Verifies there is one data series per stats name.
value = NULL;
pc_dump->Get("stats", &value);
- EXPECT_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, value->type());
base::DictionaryValue* dataSeries =
static_cast<base::DictionaryValue*>(value);
diff --git a/content/child/v8_value_converter_impl.cc b/content/child/v8_value_converter_impl.cc
index a786dc2..d7939d2 100644
--- a/content/child/v8_value_converter_impl.cc
+++ b/content/child/v8_value_converter_impl.cc
@@ -234,7 +234,7 @@
v8::Local<v8::Object> creation_context,
const base::Value* value) const {
CHECK(value);
- switch (value->GetType()) {
+ switch (value->type()) {
case base::Value::Type::NONE:
return v8::Null(isolate);
@@ -277,7 +277,7 @@
return ToArrayBuffer(isolate, creation_context, value);
default:
- LOG(ERROR) << "Unexpected value type: " << value->GetType();
+ LOG(ERROR) << "Unexpected value type: " << value->type();
return v8::Null(isolate);
}
}
diff --git a/content/child/v8_value_converter_impl_unittest.cc b/content/child/v8_value_converter_impl_unittest.cc
index c3bac08..e27178d 100644
--- a/content/child/v8_value_converter_impl_unittest.cc
+++ b/content/child/v8_value_converter_impl_unittest.cc
@@ -132,7 +132,7 @@
ADD_FAILURE();
return false;
}
- return child->GetType() == base::Value::Type::NONE;
+ return child->type() == base::Value::Type::NONE;
}
bool IsNull(v8::Local<v8::Object> value, const std::string& key) {
@@ -151,7 +151,7 @@
ADD_FAILURE();
return false;
}
- return child->GetType() == base::Value::Type::NONE;
+ return child->type() == base::Value::Type::NONE;
}
bool IsNull(v8::Local<v8::Array> value, uint32_t index) {
@@ -174,7 +174,7 @@
if (expected_value) {
ASSERT_TRUE(raw.get());
EXPECT_TRUE(expected_value->Equals(raw.get()));
- EXPECT_EQ(expected_type, raw->GetType());
+ EXPECT_EQ(expected_type, raw->type());
} else {
EXPECT_FALSE(raw.get());
}
@@ -188,7 +188,7 @@
if (expected_value) {
base::Value* temp = NULL;
ASSERT_TRUE(dictionary->Get("test", &temp));
- EXPECT_EQ(expected_type, temp->GetType());
+ EXPECT_EQ(expected_type, temp->type());
EXPECT_TRUE(expected_value->Equals(temp));
} else {
EXPECT_FALSE(dictionary->HasKey("test"));
@@ -202,14 +202,14 @@
if (expected_value) {
base::Value* temp = NULL;
ASSERT_TRUE(list->Get(0, &temp));
- EXPECT_EQ(expected_type, temp->GetType());
+ EXPECT_EQ(expected_type, temp->type());
EXPECT_TRUE(expected_value->Equals(temp));
} else {
// Arrays should preserve their length, and convert unconvertible
// types into null.
base::Value* temp = NULL;
ASSERT_TRUE(list->Get(0, &temp));
- EXPECT_EQ(base::Value::Type::NONE, temp->GetType());
+ EXPECT_EQ(base::Value::Type::NONE, temp->type());
}
}
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index 97d28e21..30aafc4 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -197,7 +197,7 @@
return false;
}
- DCHECK_EQ(base::Value::Type::STRING, value->GetType());
+ DCHECK_EQ(base::Value::Type::STRING, value->type());
std::string actual_response;
if (value->GetAsString(&actual_response))
DCHECK_EQ(expected_response, actual_response);
diff --git a/dbus/values_util.cc b/dbus/values_util.cc
index e57380d..e62a959 100644
--- a/dbus/values_util.cc
+++ b/dbus/values_util.cc
@@ -66,7 +66,7 @@
// Gets the D-Bus type signature for the value.
std::string GetTypeSignature(const base::Value& value) {
- switch (value.GetType()) {
+ switch (value.type()) {
case base::Value::Type::BOOLEAN:
return "b";
case base::Value::Type::INTEGER:
@@ -82,7 +82,7 @@
case base::Value::Type::LIST:
return "av";
default:
- DLOG(ERROR) << "Unexpected type " << value.GetType();
+ DLOG(ERROR) << "Unexpected type " << value.type();
return std::string();
}
}
@@ -215,7 +215,7 @@
}
void AppendBasicTypeValueData(MessageWriter* writer, const base::Value& value) {
- switch (value.GetType()) {
+ switch (value.type()) {
case base::Value::Type::BOOLEAN: {
bool bool_value = false;
bool success = value.GetAsBoolean(&bool_value);
@@ -245,7 +245,7 @@
break;
}
default:
- DLOG(ERROR) << "Unexpected type " << value.GetType();
+ DLOG(ERROR) << "Unexpected type " << value.type();
break;
}
}
@@ -259,7 +259,7 @@
}
void AppendValueData(MessageWriter* writer, const base::Value& value) {
- switch (value.GetType()) {
+ switch (value.type()) {
case base::Value::Type::DICTIONARY: {
const base::DictionaryValue* dictionary = NULL;
value.GetAsDictionary(&dictionary);
@@ -294,7 +294,7 @@
AppendBasicTypeValueData(writer, value);
break;
default:
- DLOG(ERROR) << "Unexpected type: " << value.GetType();
+ DLOG(ERROR) << "Unexpected type: " << value.type();
}
}
diff --git a/device/geolocation/network_location_request.cc b/device/geolocation/network_location_request.cc
index 7d424fa..1b20d66 100644
--- a/device/geolocation/network_location_request.cc
+++ b/device/geolocation/network_location_request.cc
@@ -386,7 +386,7 @@
if (!response_value->IsType(base::Value::Type::DICTIONARY)) {
VLOG(1) << "ParseServerResponse() : Unexpected response type "
- << response_value->GetType();
+ << response_value->type();
return false;
}
const base::DictionaryValue* response_object =
@@ -405,7 +405,7 @@
if (!location_value->IsType(base::Value::Type::DICTIONARY)) {
if (!location_value->IsType(base::Value::Type::NONE)) {
VLOG(1) << "ParseServerResponse() : Unexpected location type "
- << location_value->GetType();
+ << location_value->type();
// If the network provider was unable to provide a position fix, it should
// return a HTTP 200, with "location" : null. Otherwise it's an error.
return false;
diff --git a/extensions/browser/api/cast_channel/cast_channel_api.cc b/extensions/browser/api/cast_channel/cast_channel_api.cc
index 4e3235bed..7da3702 100644
--- a/extensions/browser/api/cast_channel/cast_channel_api.cc
+++ b/extensions/browser/api/cast_channel/cast_channel_api.cc
@@ -357,7 +357,7 @@
SetError("message_info.destination_id is required");
return false;
}
- switch (params_->message.data->GetType()) {
+ switch (params_->message.data->type()) {
case base::Value::Type::STRING:
case base::Value::Type::BINARY:
break;
diff --git a/extensions/browser/api/cast_channel/cast_message_util.cc b/extensions/browser/api/cast_channel/cast_message_util.cc
index 5ae4e5c..d35c4ec4 100644
--- a/extensions/browser/api/cast_channel/cast_message_util.cc
+++ b/extensions/browser/api/cast_channel/cast_message_util.cc
@@ -28,7 +28,7 @@
// Determine the type of the base::Value and set the message payload
// appropriately.
std::string data;
- switch (message.data->GetType()) {
+ switch (message.data->type()) {
// JS string
case base::Value::Type::STRING:
if (message.data->GetAsString(&data)) {
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
index 79c609a7..6372a7ce 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
@@ -503,7 +503,7 @@
std::vector<std::unique_ptr<const StringMatchTest>>* tests =
is_name ? &name_match : &value_match;
- switch (content->GetType()) {
+ switch (content->type()) {
case base::Value::Type::LIST: {
const base::ListValue* list = NULL;
CHECK(content->GetAsList(&list));
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
index 811d3ae..4b47281d 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
@@ -387,7 +387,7 @@
std::unique_ptr<base::Value> entry_owned;
if (!dictionary->GetWithoutPathExpansion(*name, &entry))
return std::unique_ptr<base::DictionaryValue>();
- switch (entry->GetType()) {
+ switch (entry->type()) {
case base::Value::Type::STRING: {
// Replace the present string with a list.
auto list = std::make_unique<base::ListValue>();
diff --git a/extensions/browser/api/sockets_tcp/sockets_tcp_apitest.cc b/extensions/browser/api/sockets_tcp/sockets_tcp_apitest.cc
index 461357f8..4d62b093 100644
--- a/extensions/browser/api/sockets_tcp/sockets_tcp_apitest.cc
+++ b/extensions/browser/api/sockets_tcp/sockets_tcp_apitest.cc
@@ -65,7 +65,7 @@
api_test_utils::RunFunctionAndReturnSingleResult(
socket_create_function.get(), "[]", browser_context()));
- ASSERT_EQ(base::Value::Type::DICTIONARY, result->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, result->type());
std::unique_ptr<base::DictionaryValue> value =
base::DictionaryValue::From(std::move(result));
int socketId = -1;
diff --git a/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_apitest.cc b/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_apitest.cc
index e941cb3..631596d 100644
--- a/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_apitest.cc
+++ b/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_apitest.cc
@@ -63,7 +63,7 @@
std::unique_ptr<base::Value> result(
api_test_utils::RunFunctionAndReturnSingleResult(
socket_create_function.get(), "[]", browser_context()));
- ASSERT_EQ(base::Value::Type::DICTIONARY, result->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, result->type());
std::unique_ptr<base::DictionaryValue> value =
base::DictionaryValue::From(std::move(result));
int socketId = -1;
diff --git a/extensions/browser/api/storage/storage_api.cc b/extensions/browser/api/storage/storage_api.cc
index 72eac82..f2ffba4 100644
--- a/extensions/browser/api/storage/storage_api.cc
+++ b/extensions/browser/api/storage/storage_api.cc
@@ -148,7 +148,7 @@
if (!args_->Get(0, &input))
return BadMessage();
- switch (input->GetType()) {
+ switch (input->type()) {
case base::Value::Type::NONE:
return UseReadResult(storage->Get());
@@ -192,7 +192,7 @@
size_t bytes_in_use = 0;
- switch (input->GetType()) {
+ switch (input->type()) {
case base::Value::Type::NONE:
bytes_in_use = storage->GetBytesInUse();
break;
@@ -239,7 +239,7 @@
if (!args_->Get(0, &input))
return BadMessage();
- switch (input->GetType()) {
+ switch (input->type()) {
case base::Value::Type::STRING: {
std::string as_string;
input->GetAsString(&as_string);
diff --git a/extensions/browser/api/system_network/system_network_api_unittest.cc b/extensions/browser/api/system_network/system_network_api_unittest.cc
index e247aca..3e50ceb 100644
--- a/extensions/browser/api/system_network/system_network_api_unittest.cc
+++ b/extensions/browser/api/system_network/system_network_api_unittest.cc
@@ -30,7 +30,7 @@
std::unique_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
socket_function.get(), "[]", browser_context()));
- ASSERT_EQ(base::Value::Type::LIST, result->GetType());
+ ASSERT_EQ(base::Value::Type::LIST, result->type());
// All we can confirm is that we have at least one address, but not what it
// is.
diff --git a/extensions/common/api/declarative/declarative_manifest_data.cc b/extensions/common/api/declarative/declarative_manifest_data.cc
index 31011309..2a0eb8d 100644
--- a/extensions/common/api/declarative/declarative_manifest_data.cc
+++ b/extensions/common/api/declarative/declarative_manifest_data.cc
@@ -50,7 +50,7 @@
base::DictionaryValue* dictionary = nullptr;
if (!value->GetAsDictionary(&dictionary)) {
error_builder->Append("expected dictionary, got %s",
- base::Value::GetTypeName(value->GetType()));
+ base::Value::GetTypeName(value->type()));
return false;
}
std::string type;
@@ -123,7 +123,7 @@
const base::ListValue* list = nullptr;
if (!value.GetAsList(&list)) {
error_builder.Append("'event_rules' expected list, got %s",
- base::Value::GetTypeName(value.GetType()));
+ base::Value::GetTypeName(value.type()));
return std::unique_ptr<DeclarativeManifestData>();
}
@@ -131,7 +131,7 @@
const base::DictionaryValue* dict = nullptr;
if (!element.GetAsDictionary(&dict)) {
error_builder.Append("expected dictionary, got %s",
- base::Value::GetTypeName(element.GetType()));
+ base::Value::GetTypeName(element.type()));
return std::unique_ptr<DeclarativeManifestData>();
}
std::string event;
diff --git a/extensions/common/extension_api.cc b/extensions/common/extension_api.cc
index 28cbdea..4f18193 100644
--- a/extensions/common/extension_api.cc
+++ b/extensions/common/extension_api.cc
@@ -48,7 +48,7 @@
// Tracking down http://crbug.com/121424
char buf[128];
base::snprintf(buf, arraysize(buf), "%s: (%d) '%s'", name.c_str(),
- result.get() ? static_cast<int>(result->GetType()) : -1,
+ result.get() ? static_cast<int>(result->type()) : -1,
error_message.c_str());
CHECK(result.get()) << error_message << " for schema " << schema;
diff --git a/extensions/common/file_util_unittest.cc b/extensions/common/file_util_unittest.cc
index b9696fdd..be157eb 100644
--- a/extensions/common/file_util_unittest.cc
+++ b/extensions/common/file_util_unittest.cc
@@ -63,7 +63,7 @@
std::unique_ptr<base::Value> result = deserializer.Deserialize(NULL, error);
if (!result.get())
return NULL;
- CHECK_EQ(base::Value::Type::DICTIONARY, result->GetType());
+ CHECK_EQ(base::Value::Type::DICTIONARY, result->type());
return LoadExtensionManifest(*base::DictionaryValue::From(std::move(result)),
manifest_dir, location, extra_flags, error);
}
diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc
index eb891275..16810e3c32 100644
--- a/extensions/common/manifest_handlers/background_info.cc
+++ b/extensions/common/manifest_handlers/background_info.cc
@@ -126,7 +126,7 @@
return true;
CHECK(background_scripts_value);
- if (background_scripts_value->GetType() != base::Value::Type::LIST) {
+ if (background_scripts_value->type() != base::Value::Type::LIST) {
*error = ASCIIToUTF16(errors::kInvalidBackgroundScripts);
return false;
}
diff --git a/extensions/renderer/bindings/argument_spec.cc b/extensions/renderer/bindings/argument_spec.cc
index fe25a92..2f2daa8 100644
--- a/extensions/renderer/bindings/argument_spec.cc
+++ b/extensions/renderer/bindings/argument_spec.cc
@@ -667,7 +667,7 @@
return false;
}
if (type_ == ArgumentType::BINARY)
- DCHECK_EQ(base::Value::Type::BINARY, converted->GetType());
+ DCHECK_EQ(base::Value::Type::BINARY, converted->type());
*out_value = std::move(converted);
}
return true;
diff --git a/google_apis/drive/drive_api_parser_unittest.cc b/google_apis/drive/drive_api_parser_unittest.cc
index 3bd55577..26a3325 100644
--- a/google_apis/drive/drive_api_parser_unittest.cc
+++ b/google_apis/drive/drive_api_parser_unittest.cc
@@ -19,7 +19,7 @@
test_util::LoadJSONFile("drive/about.json");
ASSERT_TRUE(document.get());
- ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, document->type());
std::unique_ptr<AboutResource> resource(new AboutResource());
EXPECT_TRUE(resource->Parse(*document));
@@ -36,7 +36,7 @@
test_util::LoadJSONFile("drive/applist.json");
ASSERT_TRUE(document.get());
- ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, document->type());
std::unique_ptr<AppList> applist(new AppList);
EXPECT_TRUE(applist->Parse(*document));
@@ -113,7 +113,7 @@
test_util::LoadJSONFile("drive/team_drive.json");
ASSERT_TRUE(document.get());
- ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, document->type());
std::unique_ptr<TeamDriveResource> resource(new TeamDriveResource());
EXPECT_TRUE(resource->Parse(*document));
@@ -141,7 +141,7 @@
ASSERT_TRUE(document.get());
EXPECT_TRUE(TeamDriveList::HasTeamDriveListKind(*document));
- ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, document->type());
std::unique_ptr<TeamDriveList> resource(new TeamDriveList());
EXPECT_TRUE(resource->Parse(*document));
EXPECT_EQ(3U, resource->items().size());
@@ -155,7 +155,7 @@
test_util::LoadJSONFile("drive/filelist.json");
ASSERT_TRUE(document.get());
- ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, document->type());
std::unique_ptr<FileList> filelist(new FileList);
EXPECT_TRUE(filelist->Parse(*document));
@@ -262,7 +262,7 @@
test_util::LoadJSONFile("drive/changelist.json");
ASSERT_TRUE(document.get());
- ASSERT_EQ(base::Value::Type::DICTIONARY, document->GetType());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, document->type());
std::unique_ptr<ChangeList> changelist(new ChangeList);
EXPECT_TRUE(changelist->Parse(*document));
diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
index a36d8f40..0f44155c 100644
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -54,7 +54,7 @@
DCHECK(expires_in_secs);
std::unique_ptr<base::Value> value = base::JSONReader::Read(data);
- if (!value.get() || value->GetType() != base::Value::Type::DICTIONARY)
+ if (!value.get() || value->type() != base::Value::Type::DICTIONARY)
return false;
base::DictionaryValue* dict =
@@ -485,7 +485,7 @@
DCHECK(login_hint);
std::unique_ptr<base::Value> value = base::JSONReader::Read(data);
- if (!value.get() || value->GetType() != base::Value::Type::DICTIONARY)
+ if (!value.get() || value->type() != base::Value::Type::DICTIONARY)
return false;
base::DictionaryValue* dict =
diff --git a/google_apis/gaia/oauth2_access_token_fetcher_impl.cc b/google_apis/gaia/oauth2_access_token_fetcher_impl.cc
index 20cdf09..f89a8b70 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher_impl.cc
+++ b/google_apis/gaia/oauth2_access_token_fetcher_impl.cc
@@ -151,7 +151,7 @@
std::string data;
source->GetResponseAsString(&data);
std::unique_ptr<base::Value> value = base::JSONReader::Read(data);
- if (!value.get() || value->GetType() != base::Value::Type::DICTIONARY)
+ if (!value.get() || value->type() != base::Value::Type::DICTIONARY)
value.reset();
return std::unique_ptr<base::DictionaryValue>(
diff --git a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc
index 85d0b82..69c9d526 100644
--- a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc
+++ b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc
@@ -180,7 +180,7 @@
static base::DictionaryValue* ParseJson(const std::string& str) {
std::unique_ptr<base::Value> value = base::JSONReader::Read(str);
EXPECT_TRUE(value.get());
- EXPECT_EQ(base::Value::Type::DICTIONARY, value->GetType());
+ EXPECT_EQ(base::Value::Type::DICTIONARY, value->type());
return static_cast<base::DictionaryValue*>(value.release());
}
diff --git a/headless/public/domains/types_unittest.cc b/headless/public/domains/types_unittest.cc
index 4f8e4f5..40ee31c 100644
--- a/headless/public/domains/types_unittest.cc
+++ b/headless/public/domains/types_unittest.cc
@@ -209,11 +209,11 @@
.SetValue(std::move(value))
.Build());
ASSERT_TRUE(object);
- EXPECT_EQ(base::Value::Type::INTEGER, object->GetValue()->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, object->GetValue()->type());
std::unique_ptr<accessibility::AXValue> clone(object->Clone());
ASSERT_TRUE(clone);
- EXPECT_EQ(base::Value::Type::INTEGER, clone->GetValue()->GetType());
+ EXPECT_EQ(base::Value::Type::INTEGER, clone->GetValue()->type());
int clone_value;
ASSERT_TRUE(clone->GetValue()->GetAsInteger(&clone_value));
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 36be6a6..6ea3e902 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -84,9 +84,9 @@
return;
}
- m->WriteInt(static_cast<int>(value->GetType()));
+ m->WriteInt(static_cast<int>(value->type()));
- switch (value->GetType()) {
+ switch (value->type()) {
case base::Value::Type::NONE:
break;
case base::Value::Type::BOOLEAN: {
diff --git a/media/base/video_frame_metadata.cc b/media/base/video_frame_metadata.cc
index 5c0cc7f..f063623 100644
--- a/media/base/video_frame_metadata.cc
+++ b/media/base/video_frame_metadata.cc
@@ -171,7 +171,7 @@
const base::Value* internal_value = nullptr;
if (dictionary_.GetWithoutPathExpansion(ToInternalKey(key),
&internal_value) &&
- internal_value->GetType() == base::Value::Type::BINARY) {
+ internal_value->type() == base::Value::Type::BINARY) {
return internal_value;
}
return nullptr;
diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
index 775245b..943b9ec 100644
--- a/media/base/video_frame_unittest.cc
+++ b/media/base/video_frame_unittest.cc
@@ -544,7 +544,7 @@
EXPECT_TRUE(metadata.HasKey(key));
const base::Value* const null_value = metadata.GetValue(key);
EXPECT_TRUE(null_value);
- EXPECT_EQ(base::Value::Type::NONE, null_value->GetType());
+ EXPECT_EQ(base::Value::Type::NONE, null_value->type());
metadata.Clear();
}
}
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index f0ed4e1..6a60618 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -59,7 +59,7 @@
MATCHER(IsJSONDictionary, "") {
std::string result(arg.begin(), arg.end());
std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(result));
- return (root.get() && root->GetType() == base::Value::Type::DICTIONARY);
+ return (root.get() && root->type() == base::Value::Type::DICTIONARY);
}
MATCHER(IsNullTime, "") {
return arg.is_null();
diff --git a/media/cdm/json_web_key.cc b/media/cdm/json_web_key.cc
index 7431b8d4..3a5fab11 100644
--- a/media/cdm/json_web_key.cc
+++ b/media/cdm/json_web_key.cc
@@ -174,7 +174,7 @@
}
std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(jwk_set));
- if (!root.get() || root->GetType() != base::Value::Type::DICTIONARY) {
+ if (!root.get() || root->type() != base::Value::Type::DICTIONARY) {
DVLOG(1) << "Not valid JSON: " << jwk_set << ", root: " << root.get();
return false;
}
@@ -243,7 +243,7 @@
}
std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(input));
- if (!root.get() || root->GetType() != base::Value::Type::DICTIONARY) {
+ if (!root.get() || root->type() != base::Value::Type::DICTIONARY) {
error_message->assign("Not valid JSON: ");
error_message->append(ShortenTo64Characters(input));
return false;
@@ -377,7 +377,7 @@
std::unique_ptr<base::Value> root(
base::JSONReader().ReadToValue(license_as_str));
- if (!root.get() || root->GetType() != base::Value::Type::DICTIONARY) {
+ if (!root.get() || root->type() != base::Value::Type::DICTIONARY) {
DVLOG(1) << "Not valid JSON: " << license_as_str;
return false;
}
diff --git a/mojo/common/values_struct_traits.h b/mojo/common/values_struct_traits.h
index a4f618b..264e7124 100644
--- a/mojo/common/values_struct_traits.h
+++ b/mojo/common/values_struct_traits.h
@@ -128,7 +128,7 @@
template <>
struct UnionTraits<common::mojom::ValueDataView, base::Value> {
static common::mojom::ValueDataView::Tag GetTag(const base::Value& data) {
- switch (data.GetType()) {
+ switch (data.type()) {
case base::Value::Type::NONE:
return common::mojom::ValueDataView::Tag::NULL_VALUE;
case base::Value::Type::BOOLEAN:
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
index da7009f8..3f0ad15f 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -24,7 +24,7 @@
const base::Value& value_node,
base::CommandLine* command_line) {
std::string argument_name = "--" + key;
- switch (value_node.GetType()) {
+ switch (value_node.type()) {
case base::Value::Type::NONE:
command_line->AppendArg(argument_name);
break;
diff --git a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.cc b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.cc
index a2b10dd3..be869c8 100644
--- a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.cc
+++ b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.cc
@@ -40,7 +40,7 @@
return PP_MakeNull();
}
- switch (value->GetType()) {
+ switch (value->type()) {
case base::Value::Type::NONE:
return PP_MakeNull();
case base::Value::Type::BOOLEAN: {
diff --git a/remoting/host/policy_watcher.cc b/remoting/host/policy_watcher.cc
index 08c72bdd..581be12f 100644
--- a/remoting/host/policy_watcher.cc
+++ b/remoting/host/policy_watcher.cc
@@ -62,7 +62,7 @@
continue;
}
- CHECK(value->IsType(i.value().GetType()));
+ CHECK(value->IsType(i.value().type()));
to->Set(i.key(), value->CreateDeepCopy());
}
diff --git a/remoting/host/policy_watcher_unittest.cc b/remoting/host/policy_watcher_unittest.cc
index 2b220a21..6e6a1bb 100644
--- a/remoting/host/policy_watcher_unittest.cc
+++ b/remoting/host/policy_watcher_unittest.cc
@@ -697,7 +697,7 @@
std::map<std::string, base::Value::Type> expected_schema;
for (base::DictionaryValue::Iterator i(GetDefaultValues()); !i.IsAtEnd();
i.Advance()) {
- expected_schema[i.key()] = i.value().GetType();
+ expected_schema[i.key()] = i.value().type();
}
#if defined(OS_WIN)
// RemoteAccessHostMatchUsername is marked in policy_templates.json as not
diff --git a/services/preferences/tracked/pref_hash_calculator_unittest.cc b/services/preferences/tracked/pref_hash_calculator_unittest.cc
index 84f367d9..635d8e2 100644
--- a/services/preferences/tracked/pref_hash_calculator_unittest.cc
+++ b/services/preferences/tracked/pref_hash_calculator_unittest.cc
@@ -111,13 +111,13 @@
list_value->AppendInteger(100);
list_value->AppendDouble(1.0);
- ASSERT_EQ(base::Value::Type::NONE, null_value->GetType());
- ASSERT_EQ(base::Value::Type::BOOLEAN, bool_value->GetType());
- ASSERT_EQ(base::Value::Type::INTEGER, int_value->GetType());
- ASSERT_EQ(base::Value::Type::DOUBLE, double_value->GetType());
- ASSERT_EQ(base::Value::Type::STRING, string_value->GetType());
- ASSERT_EQ(base::Value::Type::DICTIONARY, dict_value->GetType());
- ASSERT_EQ(base::Value::Type::LIST, list_value->GetType());
+ ASSERT_EQ(base::Value::Type::NONE, null_value->type());
+ ASSERT_EQ(base::Value::Type::BOOLEAN, bool_value->type());
+ ASSERT_EQ(base::Value::Type::INTEGER, int_value->type());
+ ASSERT_EQ(base::Value::Type::DOUBLE, double_value->type());
+ ASSERT_EQ(base::Value::Type::STRING, string_value->type());
+ ASSERT_EQ(base::Value::Type::DICTIONARY, dict_value->type());
+ ASSERT_EQ(base::Value::Type::LIST, list_value->type());
// Test every value type independently. Intentionally omits Type::BINARY which
// isn't even allowed in JSONWriter's input.
diff --git a/tools/json_schema_compiler/util.cc b/tools/json_schema_compiler/util.cc
index 441fc25..227ad3b 100644
--- a/tools/json_schema_compiler/util.cc
+++ b/tools/json_schema_compiler/util.cc
@@ -20,7 +20,7 @@
error->append(base::ASCIIToUTF16("; "));
error->append(base::ASCIIToUTF16(base::StringPrintf(
"expected %s, got %s", base::Value::GetTypeName(expected),
- base::Value::GetTypeName(from.GetType()))));
+ base::Value::GetTypeName(from.type()))));
return false; // Always false on purpose.
}
