| Index: chrome/browser/android/provider/chrome_browser_provider.cc
|
| diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc
|
| index cd0c28fe3c7d21f1deea1c82ac5ed35629822b5a..794a86881e66356c58c83627e892e46e03db6299 100644
|
| --- a/chrome/browser/android/provider/chrome_browser_provider.cc
|
| +++ b/chrome/browser/android/provider/chrome_browser_provider.cc
|
| @@ -169,7 +169,7 @@ GURL ParseAndMaybeAppendScheme(const base::string16& url,
|
| const char* default_scheme) {
|
| GURL gurl(url);
|
| if (!gurl.is_valid() && !gurl.has_scheme()) {
|
| - base::string16 refined_url(ASCIIToUTF16(default_scheme));
|
| + base::string16 refined_url(base::ASCIIToUTF16(default_scheme));
|
| refined_url.append(url);
|
| gurl = GURL(refined_url);
|
| }
|
| @@ -1095,7 +1095,7 @@ void FillBookmarkRow(JNIEnv* env,
|
| // history::BookmarkRow.raw_url_.
|
| GURL gurl = ParseAndMaybeAppendScheme(raw_url, kDefaultUrlScheme);
|
| row->set_url(gurl);
|
| - row->set_raw_url(UTF16ToUTF8(raw_url));
|
| + row->set_raw_url(base::UTF16ToUTF8(raw_url));
|
| }
|
|
|
| if (created)
|
|
|