| Index: content/browser/webui/web_ui_impl.cc
|
| diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc
|
| index 445bbeb65536f5075e719921feb901bf55906291..72261c37ec46ff7d84751958fd54ab4c94e321c3 100644
|
| --- a/content/browser/webui/web_ui_impl.cc
|
| +++ b/content/browser/webui/web_ui_impl.cc
|
| @@ -139,14 +139,14 @@ void WebUIImpl::SetController(WebUIController* controller) {
|
| }
|
|
|
| void WebUIImpl::CallJavascriptFunction(const std::string& function_name) {
|
| - DCHECK(IsStringASCII(function_name));
|
| + DCHECK(base::IsStringASCII(function_name));
|
| base::string16 javascript = base::ASCIIToUTF16(function_name + "();");
|
| ExecuteJavascript(javascript);
|
| }
|
|
|
| void WebUIImpl::CallJavascriptFunction(const std::string& function_name,
|
| const base::Value& arg) {
|
| - DCHECK(IsStringASCII(function_name));
|
| + DCHECK(base::IsStringASCII(function_name));
|
| std::vector<const base::Value*> args;
|
| args.push_back(&arg);
|
| ExecuteJavascript(GetJavascriptCall(function_name, args));
|
| @@ -155,7 +155,7 @@ void WebUIImpl::CallJavascriptFunction(const std::string& function_name,
|
| void WebUIImpl::CallJavascriptFunction(
|
| const std::string& function_name,
|
| const base::Value& arg1, const base::Value& arg2) {
|
| - DCHECK(IsStringASCII(function_name));
|
| + DCHECK(base::IsStringASCII(function_name));
|
| std::vector<const base::Value*> args;
|
| args.push_back(&arg1);
|
| args.push_back(&arg2);
|
| @@ -165,7 +165,7 @@ void WebUIImpl::CallJavascriptFunction(
|
| void WebUIImpl::CallJavascriptFunction(
|
| const std::string& function_name,
|
| const base::Value& arg1, const base::Value& arg2, const base::Value& arg3) {
|
| - DCHECK(IsStringASCII(function_name));
|
| + DCHECK(base::IsStringASCII(function_name));
|
| std::vector<const base::Value*> args;
|
| args.push_back(&arg1);
|
| args.push_back(&arg2);
|
| @@ -179,7 +179,7 @@ void WebUIImpl::CallJavascriptFunction(
|
| const base::Value& arg2,
|
| const base::Value& arg3,
|
| const base::Value& arg4) {
|
| - DCHECK(IsStringASCII(function_name));
|
| + DCHECK(base::IsStringASCII(function_name));
|
| std::vector<const base::Value*> args;
|
| args.push_back(&arg1);
|
| args.push_back(&arg2);
|
| @@ -191,7 +191,7 @@ void WebUIImpl::CallJavascriptFunction(
|
| void WebUIImpl::CallJavascriptFunction(
|
| const std::string& function_name,
|
| const std::vector<const base::Value*>& args) {
|
| - DCHECK(IsStringASCII(function_name));
|
| + DCHECK(base::IsStringASCII(function_name));
|
| ExecuteJavascript(GetJavascriptCall(function_name, args));
|
| }
|
|
|
|
|