more changes

chrome/browser/ui/webui/net_internals_ui_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/web_ui_browsertest.h"
@@ skipping 218 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Runs the test suite twice, expecting a passing result the first time.  Checks
 // the first result, the order of events that occur, and the number of rows in
 // the table.
 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsTestViewPassTwice) {
   ASSERT_TRUE(test_server()->Start());
   RunTestAndWaitForTitle(
       "NetInternalsTestView",
       // URL that results in success.
-      Value::CreateStringValue(
+      base::StringValue::New(
           test_server()->GetURL("files/title1.html").spec()),
       // Resulting error code of the first test.
-      Value::CreateIntegerValue(net::OK),
+      base::NumberValue::New(net::OK),
       // Number of times to run the test suite.
-      Value::CreateIntegerValue(2));
+      base::NumberValue::New(2));
 }
 
 // Runs the test suite twice, expecting a failing result the first time.  Checks
 // the first result, the order of events that occur, and the number of rows in
 // the table.
 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsTestViewFailTwice) {
   RunTestAndWaitForTitle(
       "NetInternalsTestView",
       // URL that results in an error, due to the port.
-      Value::CreateStringValue("http://127.0.0.1:7/"),
+      base::StringValue::New("http://127.0.0.1:7/"),
       // Resulting error code of the first test.
-      Value::CreateIntegerValue(net::ERR_UNSAFE_PORT),
+      base::NumberValue::New(net::ERR_UNSAFE_PORT),
       // Number of times to run the test suite.
-      Value::CreateIntegerValue(2));
+      base::NumberValue::New(2));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // prerender_view.js
 ////////////////////////////////////////////////////////////////////////////////
 
 // Prerender a page and navigate to it, once prerendering starts.
 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsPrerenderViewSucceed) {
   ASSERT_TRUE(test_server()->Start());
   RunTestAndWaitForTitle(
       "NetInternalsPrerenderView",
       // URL that can be prerendered.
-      Value::CreateStringValue(
+      base::StringValue::New(
           test_server()->GetURL("files/title1.html").spec()),
-      Value::CreateBooleanValue(true),
-      Value::CreateStringValue(
+      base::TrueValue(),
+      base::StringValue::New(
           prerender::NameFromFinalStatus(prerender::FINAL_STATUS_USED)));
 }
 
 // Prerender a page that is expected to fail.
 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsPrerenderViewFail) {
   ASSERT_TRUE(test_server()->Start());
   RunTestAndWaitForTitle(
       "NetInternalsPrerenderView",
       // URL that can't be prerendered, since it triggers a download.
-      Value::CreateStringValue(
+      base::StringValue::New(
           test_server()->GetURL("files/download-test1.lib").spec()),
-      Value::CreateBooleanValue(false),
-      Value::CreateStringValue(
+      base::FalseValue(),
+      base::StringValue::New(
           prerender::NameFromFinalStatus(prerender::FINAL_STATUS_DOWNLOAD)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // log_view_painter.js
 ////////////////////////////////////////////////////////////////////////////////
 
 // Check that we correctly remove cookies and login information.
 IN_PROC_BROWSER_TEST_F(NetInternalsTest,
                        NetInternalsLogViewPainterStripInfo) {
   RunTestAndWaitForTitle("NetInternalsLogViewPainterStripInfo");
 }
 
 }  // namespace