| Index: chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
|
| diff --git a/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc b/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
|
| index 37e328465024d0a29ff7b385bff2fc6d572386dc..ecdc85b53538480756b32e7a584a4aeeb5b251da 100644
|
| --- a/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
|
| +++ b/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
|
| @@ -60,8 +60,8 @@ void AssertEvalFails(const base::DictionaryValue& command_result) {
|
| scoped_ptr<base::DictionaryValue> result;
|
| FakeDevToolsClient client;
|
| client.set_result(command_result);
|
| - Status status = internal::EvaluateScript(&client, 0, "",
|
| - internal::ReturnByValue, &result);
|
| + Status status = internal::EvaluateScript(
|
| + &client, 0, std::string(), internal::ReturnByValue, &result);
|
| ASSERT_EQ(kUnknownError, status.code());
|
| ASSERT_FALSE(result);
|
| }
|
| @@ -72,8 +72,8 @@ TEST(EvaluateScript, CommandError) {
|
| scoped_ptr<base::DictionaryValue> result;
|
| FakeDevToolsClient client;
|
| client.set_status(Status(kUnknownError));
|
| - Status status = internal::EvaluateScript(&client, 0, "",
|
| - internal::ReturnByValue, &result);
|
| + Status status = internal::EvaluateScript(
|
| + &client, 0, std::string(), internal::ReturnByValue, &result);
|
| ASSERT_EQ(kUnknownError, status.code());
|
| ASSERT_FALSE(result);
|
| }
|
| @@ -104,7 +104,7 @@ TEST(EvaluateScript, Ok) {
|
| FakeDevToolsClient client;
|
| client.set_result(dict);
|
| ASSERT_TRUE(internal::EvaluateScript(
|
| - &client, 0, "", internal::ReturnByValue, &result).IsOk());
|
| + &client, 0, std::string(), internal::ReturnByValue, &result).IsOk());
|
| ASSERT_TRUE(result);
|
| ASSERT_TRUE(result->HasKey("key"));
|
| }
|
| @@ -117,7 +117,7 @@ TEST(EvaluateScriptAndGetValue, MissingType) {
|
| dict.SetInteger("result.value", 1);
|
| client.set_result(dict);
|
| ASSERT_TRUE(internal::EvaluateScriptAndGetValue(
|
| - &client, 0, "", &result).IsError());
|
| + &client, 0, std::string(), &result).IsError());
|
| }
|
|
|
| TEST(EvaluateScriptAndGetValue, Undefined) {
|
| @@ -127,8 +127,8 @@ TEST(EvaluateScriptAndGetValue, Undefined) {
|
| dict.SetBoolean("wasThrown", false);
|
| dict.SetString("result.type", "undefined");
|
| client.set_result(dict);
|
| - Status status = internal::EvaluateScriptAndGetValue(
|
| - &client, 0, "", &result);
|
| + Status status =
|
| + internal::EvaluateScriptAndGetValue(&client, 0, std::string(), &result);
|
| ASSERT_EQ(kOk, status.code());
|
| ASSERT_TRUE(result && result->IsType(base::Value::TYPE_NULL));
|
| }
|
| @@ -141,8 +141,8 @@ TEST(EvaluateScriptAndGetValue, Ok) {
|
| dict.SetString("result.type", "integer");
|
| dict.SetInteger("result.value", 1);
|
| client.set_result(dict);
|
| - Status status = internal::EvaluateScriptAndGetValue(
|
| - &client, 0, "", &result);
|
| + Status status =
|
| + internal::EvaluateScriptAndGetValue(&client, 0, std::string(), &result);
|
| ASSERT_EQ(kOk, status.code());
|
| int value;
|
| ASSERT_TRUE(result && result->GetAsInteger(&value));
|
| @@ -158,7 +158,7 @@ TEST(EvaluateScriptAndGetObject, NoObject) {
|
| bool got_object;
|
| std::string object_id;
|
| ASSERT_TRUE(internal::EvaluateScriptAndGetObject(
|
| - &client, 0, "", &got_object, &object_id).IsOk());
|
| + &client, 0, std::string(), &got_object, &object_id).IsOk());
|
| ASSERT_FALSE(got_object);
|
| ASSERT_TRUE(object_id.empty());
|
| }
|
| @@ -172,7 +172,7 @@ TEST(EvaluateScriptAndGetObject, Ok) {
|
| bool got_object;
|
| std::string object_id;
|
| ASSERT_TRUE(internal::EvaluateScriptAndGetObject(
|
| - &client, 0, "", &got_object, &object_id).IsOk());
|
| + &client, 0, std::string(), &got_object, &object_id).IsOk());
|
| ASSERT_TRUE(got_object);
|
| ASSERT_STREQ("id", object_id.c_str());
|
| }
|
|
|