diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 18:01:49 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 18:01:49 +0000 |
| commit | 04307e0c502a22c7c07d8bdfd2a8209de64f197b (patch) | |
| tree | 47be3bb8174b85f2ae2d21e3bcd89a965c76936e /android_webview | |
| parent | d13e288993386e917a708238f062988fdf2d0ef0 (diff) | |
| download | chromium_src-04307e0c502a22c7c07d8bdfd2a8209de64f197b.zip chromium_src-04307e0c502a22c7c07d8bdfd2a8209de64f197b.tar.gz chromium_src-04307e0c502a22c7c07d8bdfd2a8209de64f197b.tar.bz2 | |
Renamed namespaces of url lib.
url_util -> url
url_parse -> url
url_canon -> url
BUG=364747
TBR=atwilson,battre
Review URL: https://codereview.chromium.org/262593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/lib/main/webview_entry_point.cc | 4 | ||||
| -rw-r--r-- | android_webview/renderer/aw_render_view_ext.cc | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc index 1eefd52..1aa1d27 100644 --- a/android_webview/lib/main/webview_entry_point.cc +++ b/android_webview/lib/main/webview_entry_point.cc @@ -49,10 +49,10 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { content::SetContentMainDelegate(new android_webview::AwMainDelegate()); - // Initialize url_util here while we are still single-threaded, in case we use + // Initialize url lib here while we are still single-threaded, in case we use // CookieManager before initializing Chromium (which would normally have done // this). It's safe to call this multiple times. - url_util::Initialize(); + url::Initialize(); return JNI_VERSION_1_4; } diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index b12821e..033fce6 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -69,9 +69,10 @@ bool RemovePrefixAndAssignIfMatches(const base::StringPiece& prefix, const base::StringPiece spec(url.possibly_invalid_spec()); if (spec.starts_with(prefix)) { - url_canon::RawCanonOutputW<1024> output; - url_util::DecodeURLEscapeSequences(spec.data() + prefix.length(), - spec.length() - prefix.length(), &output); + url::RawCanonOutputW<1024> output; + url::DecodeURLEscapeSequences(spec.data() + prefix.length(), + spec.length() - prefix.length(), + &output); std::string decoded_url = base::UTF16ToUTF8( base::string16(output.data(), output.length())); dest->assign(decoded_url.begin(), decoded_url.end()); |