| Index: chrome/browser/autocomplete/builtin_provider_unittest.cc
|
| diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc
|
| index e99751ee6e259cd2e0fc5b58fdd0849f5e73fa97..8036e33596c63cd6062f3a55c03ce3d88c8538d1 100644
|
| --- a/chrome/browser/autocomplete/builtin_provider_unittest.cc
|
| +++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc
|
| @@ -60,7 +60,7 @@ class BuiltinProviderTest : public testing::Test {
|
|
|
| #if !defined(OS_ANDROID)
|
| TEST_F(BuiltinProviderTest, TypingScheme) {
|
| - const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
|
| + const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
|
| const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
|
| const base::string16 kSeparator1 = ASCIIToUTF16(":");
|
| const base::string16 kSeparator2 = ASCIIToUTF16(":/");
|
| @@ -107,7 +107,7 @@ TEST_F(BuiltinProviderTest, TypingScheme) {
|
| }
|
| #else // Android uses a subset of the URLs
|
| TEST_F(BuiltinProviderTest, TypingScheme) {
|
| - const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
|
| + const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
|
| const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
|
| const base::string16 kSeparator1 = ASCIIToUTF16(":");
|
| const base::string16 kSeparator2 = ASCIIToUTF16(":/");
|
| @@ -172,7 +172,7 @@ TEST_F(BuiltinProviderTest, NonChromeURLs) {
|
| }
|
|
|
| TEST_F(BuiltinProviderTest, ChromeURLs) {
|
| - const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
|
| + const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
|
| const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
|
| const base::string16 kSeparator1 = ASCIIToUTF16(":");
|
| const base::string16 kSeparator2 = ASCIIToUTF16(":/");
|
| @@ -225,9 +225,9 @@ TEST_F(BuiltinProviderTest, ChromeURLs) {
|
| }
|
|
|
| TEST_F(BuiltinProviderTest, AboutBlank) {
|
| - const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
|
| + const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
|
| const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
|
| - const base::string16 kAboutBlank = ASCIIToUTF16(content::kAboutBlankURL);
|
| + const base::string16 kAboutBlank = ASCIIToUTF16(url::kAboutBlankURL);
|
| const base::string16 kBlank = ASCIIToUTF16("blank");
|
| const base::string16 kSeparator1 =
|
| ASCIIToUTF16(url::kStandardSchemeSeparator);
|
|
|