more changes

chrome/browser/ui/webui/web_ui_browsertest.cc

Index: chrome/browser/ui/webui/web_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc
index 332b59f69ab4a434417d663cb4d8c7fd4fb4209a..275b8807e9714e1b98634fc81d12d047291e7db9 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -82,8 +82,8 @@ bool WebUIBrowserTest::RunJavascriptFunction(
 bool WebUIBrowserTest::RunJavascriptTestF(const std::string& test_fixture,
                                           const std::string& test_name) {
   ConstValueVector args;
-  args.push_back(Value::CreateStringValue(test_fixture));
-  args.push_back(Value::CreateStringValue(test_name));
+  args.push_back(base::StringValue::New(test_fixture));
+  args.push_back(base::StringValue::New(test_name));
   return RunJavascriptTest("RUN_TEST_F", args);
 }
 
@@ -146,8 +146,8 @@ void WebUIBrowserTest::PreLoadJavascriptLibraries(
     RenderViewHost* preload_host) {
   ASSERT_FALSE(libraries_preloaded_);
   ConstValueVector args;
-  args.push_back(Value::CreateStringValue(preload_test_fixture));
-  args.push_back(Value::CreateStringValue(preload_test_name));
+  args.push_back(base::StringValue::New(preload_test_fixture));
+  args.push_back(base::StringValue::New(preload_test_name));
   RunJavascriptUsingHandler(
       "preloadJavascriptLibraries", args, false, false, preload_host);
   libraries_preloaded_ = true;
@@ -255,7 +255,7 @@ string16 WebUIBrowserTest::BuildRunTestJSCall(
     const std::string& function_name,
     const WebUIBrowserTest::ConstValueVector& test_func_args) {
   WebUIBrowserTest::ConstValueVector arguments;
-  base::FundamentalValue is_async_arg(is_async);
+  base::BooleanValue is_async_arg(is_async);
   arguments.push_back(&is_async_arg);
   StringValue function_name_arg(function_name);
   arguments.push_back(&function_name_arg);
@@ -390,12 +390,12 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
   // Starts a failing test.
   void RunTestFailsAssert() {
     RunJavascriptFunction("runAsync",
-                          *Value::CreateStringValue("testFailsAssert"));
+                          *base::StringValue::New("testFailsAssert"));
   }
 
   // Starts a passing test.
   void RunTestPasses() {
-    RunJavascriptFunction("runAsync", *Value::CreateStringValue("testPasses"));
+    RunJavascriptFunction("runAsync", *base::StringValue::New("testPasses"));
   }
 
  protected:
@@ -493,7 +493,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestSyncOkTestFail) {
 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncFailsAssert) {
   EXPECT_CALL(message_handler_, HandleTestFails(::testing::_));
   ASSERT_FALSE(RunJavascriptAsyncTest(
-      "startAsyncTest", *Value::CreateStringValue("testFailsAssert")));
+      "startAsyncTest", *base::StringValue::New("testFailsAssert")));
 }
 
 // Test that expectations continue the function, but fail the test.
@@ -502,7 +502,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncFailsExpect) {
   EXPECT_CALL(message_handler_, HandleTestContinues(::testing::_));
   EXPECT_CALL(message_handler_, HandleTestFails(::testing::_));
   ASSERT_FALSE(RunJavascriptAsyncTest(
-      "startAsyncTest", *Value::CreateStringValue("testFailsExpect")));
+      "startAsyncTest", *base::StringValue::New("testFailsExpect")));
 }
 
 // Test that test continues and passes. (Sync version).
@@ -519,7 +519,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncPasses) {
       .WillOnce(::testing::InvokeWithoutArgs(
           this, &WebUIBrowserAsyncTest::TestDone));
   ASSERT_TRUE(RunJavascriptAsyncTest(
-      "startAsyncTest", *Value::CreateStringValue("testPasses")));
+      "startAsyncTest", *base::StringValue::New("testPasses")));
 }
 
 // Test that two tests pass.
@@ -534,7 +534,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncPassPass) {
       .WillOnce(::testing::InvokeWithoutArgs(
           this, &WebUIBrowserAsyncTest::TestDone));
   ASSERT_TRUE(RunJavascriptAsyncTest(
-      "startAsyncTest", *Value::CreateStringValue("testPasses")));
+      "startAsyncTest", *base::StringValue::New("testPasses")));
 }
 
 // Test that first test passes; second fails.
@@ -546,7 +546,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncPassThenFail) {
           this, &WebUIBrowserAsyncTest::RunTestFailsAssert));
   EXPECT_CALL(message_handler_, HandleTestFails(::testing::_));
   ASSERT_FALSE(RunJavascriptAsyncTest(
-      "startAsyncTest", *Value::CreateStringValue("testPasses")));
+      "startAsyncTest", *base::StringValue::New("testPasses")));
 }
 
 // Test that testDone() with failure first then sync pass still fails.
@@ -558,7 +558,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncDoneFailFirstSyncPass) {
   // Call runAsync directly instead of deferring through startAsyncTest. It will
   // call testDone() on failure, then return.
   ASSERT_FALSE(RunJavascriptAsyncTest(
-      "runAsync", *Value::CreateStringValue("testAsyncDoneFailFirstSyncPass")));
+      "runAsync", *base::StringValue::New("testAsyncDoneFailFirstSyncPass")));
 }
 
 // Test that calling testDone during RunJavascriptAsyncTest still completes