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/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());
}
}
