| Index: chrome/test/webdriver/webdriver_session.cc
|
| diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc
|
| index efd7b1ef6e6d651550b9e9430c5937a893250ee3..4f6a6972a0a832ace78a8e32b0349e7786539ebc 100644
|
| --- a/chrome/test/webdriver/webdriver_session.cc
|
| +++ b/chrome/test/webdriver/webdriver_session.cc
|
| @@ -1137,7 +1137,7 @@ Error* Session::SwitchToFrameWithJavaScriptLocatedFrame(
|
| virtual ~SwitchFrameValueParser() { }
|
|
|
| virtual bool Parse(base::Value* value) const OVERRIDE {
|
| - if (value->IsType(Value::TYPE_NULL)) {
|
| + if (value->IsNull()) {
|
| *found_frame_ = false;
|
| return true;
|
| }
|
| @@ -1218,7 +1218,7 @@ Error* Session::ExecuteFindElementScriptAndParse(
|
| virtual ~FindElementsParser() { }
|
|
|
| virtual bool Parse(base::Value* value) const OVERRIDE {
|
| - if (!value->IsType(Value::TYPE_LIST))
|
| + if (!value->IsList())
|
| return false;
|
| ListValue* list = static_cast<ListValue*>(value);
|
| for (size_t i = 0; i < list->GetSize(); ++i) {
|
| @@ -1244,7 +1244,7 @@ Error* Session::ExecuteFindElementScriptAndParse(
|
| virtual ~FindElementParser() { }
|
|
|
| virtual bool Parse(base::Value* value) const OVERRIDE {
|
| - if (value->IsType(Value::TYPE_NULL))
|
| + if (value->IsNull())
|
| return true;
|
| ElementId element;
|
| bool set = SetFromValue(value, &element);
|
| @@ -1292,7 +1292,7 @@ Error* Session::VerifyElementIsClickable(
|
| virtual ~IsElementClickableParser() { }
|
|
|
| virtual bool Parse(base::Value* value) const OVERRIDE {
|
| - if (!value->IsType(Value::TYPE_DICTIONARY))
|
| + if (!value->IsDictionary())
|
| return false;
|
| DictionaryValue* dict = static_cast<DictionaryValue*>(value);
|
| dict->GetString("message", message_);
|
|
|