Adjust signatures to pass string rather than char* since it ultimately constructs a GURL.

R=jhawkins@chromium.org
BUG=None
TEST=browser_tests --gtest_filter=WebUIBidiCheckerBrowserTest*.*


Review URL: http://codereview.chromium.org/9701086

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127785 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 28 insertions, 26 deletions

diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
index bcfcf6c..f8fdc1e 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
@@ -51,22 +51,22 @@ void WebUIBidiCheckerBrowserTest::SetUpInProcessBrowserTestFixture() {
   WebUIBrowserTest::AddLibrary(FilePath(kBidiCheckerTestsJS));
 }
 
-void WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(const char pageURL[],
-                                                       bool isRTL) {
-  ui_test_utils::NavigateToURL(browser(), GURL(pageURL));
+void WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
+    const std::string& page_url, bool is_rtl) {
+  ui_test_utils::NavigateToURL(browser(), GURL(page_url));
   ASSERT_TRUE(RunJavascriptTest("runBidiChecker",
-                                Value::CreateStringValue(pageURL),
-                                Value::CreateBooleanValue(isRTL)));
+                                Value::CreateStringValue(page_url),
+                                Value::CreateBooleanValue(is_rtl)));
 }
 
 void WebUIBidiCheckerBrowserTestLTR::RunBidiCheckerOnPage(
-    const char pageURL[]) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, false);
+    const std::string& page_url) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, false);
 }
 
 void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage(
-    const char pageURL[]) {
-  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, true);
+    const std::string& page_url) {
+  WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, true);
 }
 
 void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
@@ -297,7 +297,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
                                 "0000");
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kAutofillSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 // http://crbug.com/94642
@@ -319,56 +319,56 @@ IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
                                 "5125551234");
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kAutofillSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsClearBrowserDataPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kClearBrowserDataSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
                        MAYBE_TestSettingsClearBrowserDataPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kClearBrowserDataSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsContentSettingsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kContentSettingsSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
                        MAYBE_TestSettingsContentSettingsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kContentSettingsSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsContentSettingsExceptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kContentSettingsExceptionsSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
                        MAYBE_TestSettingsContentSettingsExceptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kContentSettingsExceptionsSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsLanguageOptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kLanguageOptionsSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 // http://crbug.com/117871
@@ -376,19 +376,19 @@ IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
                        DISABLED_TestSettingsLanguageOptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kLanguageOptionsSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsSearchEnginesOptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kSearchEnginesSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
                        MAYBE_TestSettingsSearchEnginesOptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kSearchEnginesSubPage);
-  RunBidiCheckerOnPage(url.c_str());
+  RunBidiCheckerOnPage(url);
 }
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
index 594e4a76..b4a107f 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -6,6 +6,8 @@
 #define CHROME_BROWSER_UI_WEBUI_BIDI_CHECKER_WEB_UI_TEST_H_
 #pragma once
 
+#include <string>
+
 #include "chrome/browser/ui/webui/web_ui_browsertest.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
@@ -18,9 +20,9 @@ class WebUIBidiCheckerBrowserTest : public WebUIBrowserTest {
  protected:
   WebUIBidiCheckerBrowserTest();
 
-  // Runs the Bidi Checker on the given page URL. |isRTL| should be true when
+  // Runs the Bidi Checker on the given page URL. |is_rtl| should be true when
   // the active page locale is RTL.
-  void RunBidiCheckerOnPage(const char pageURL[], bool isRTL);
+  void RunBidiCheckerOnPage(const std::string& page_url, bool is_rtl);
 
   // Setup test path.
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
@@ -29,13 +31,13 @@ class WebUIBidiCheckerBrowserTest : public WebUIBrowserTest {
 // Base class for BidiChecker-based tests that run with an LTR UI.
 class WebUIBidiCheckerBrowserTestLTR : public WebUIBidiCheckerBrowserTest {
  public:
-  void RunBidiCheckerOnPage(const char pageURL[]);
+  void RunBidiCheckerOnPage(const std::string& page_url);
 };
 
 // Base class for BidiChecker-based tests that run with an RTL UI.
 class WebUIBidiCheckerBrowserTestRTL : public WebUIBidiCheckerBrowserTest {
  public:
-  void RunBidiCheckerOnPage(const char pageURL[]);
+  void RunBidiCheckerOnPage(const std::string& page_url);
 
  protected:
   virtual void SetUpOnMainThread() OVERRIDE;