diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:18:05 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:18:05 +0000 |
| commit | 04338722eaee6d09b761353fb6e937b41933ff5e (patch) | |
| tree | f15c65f4c1345126fdb05a5855aeb98dbef57bbb /chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc | |
| parent | cc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (diff) | |
| download | chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.zip chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.tar.gz chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.tar.bz2 | |
Revert 242454 "Revert 242450 "Update some uses of UTF conversion..."
> Revert 242450 "Update some uses of UTF conversions in chrome/bro..."
>
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> >
> > BUG=330556
> > TEST=no change
> > TBR=ben@chromium.org
> >
> > Review URL: https://codereview.chromium.org/120953002
>
> TBR=avi@chromium.org
>
> Review URL: https://codereview.chromium.org/107423005
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/121003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index a2e53b1..191e2ef 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -203,7 +203,8 @@ class DelayLoadStartAndExecuteJavascript if (validated_url != delay_url_ || !rvh_) return; - rvh_->ExecuteJavascriptInWebFrame(base::string16(), UTF8ToUTF16(script_)); + rvh_->ExecuteJavascriptInWebFrame(base::string16(), + base::UTF8ToUTF16(script_)); script_was_executed_ = true; } |