Index: chrome/browser/autocomplete/extension_app_provider_unittest.cc |
diff --git a/chrome/browser/autocomplete/extension_app_provider_unittest.cc b/chrome/browser/autocomplete/extension_app_provider_unittest.cc |
index d66dcf74d1c81d8c27fd4caaeb6c957a8634a0f0..24e8bd737ee55ef66c6748533c6f76cdcdd47364 100644 |
--- a/chrome/browser/autocomplete/extension_app_provider_unittest.cc |
+++ b/chrome/browser/autocomplete/extension_app_provider_unittest.cc |
@@ -17,7 +17,7 @@ |
class ExtensionAppProviderTest : public testing::Test { |
protected: |
struct test_data { |
- const string16 input; |
+ const base::string16 input; |
const size_t num_results; |
const GURL output[3]; |
}; |
@@ -86,8 +86,9 @@ void ExtensionAppProviderTest::RunTest( |
int num_cases) { |
ACMatches matches; |
for (int i = 0; i < num_cases; ++i) { |
- AutocompleteInput input(keyword_cases[i].input, string16::npos, string16(), |
- GURL(), AutocompleteInput::INVALID_SPEC, true, |
+ AutocompleteInput input(keyword_cases[i].input, base::string16::npos, |
+ base::string16(), GURL(), |
+ AutocompleteInput::INVALID_SPEC, true, |
false, true, AutocompleteInput::ALL_MATCHES); |
app_provider_->Start(input, false); |
EXPECT_TRUE(app_provider_->done()); |
@@ -136,10 +137,11 @@ TEST_F(ExtensionAppProviderTest, CreateMatchSanitize) { |
{ "Test\r\t\nTest", "TestTest" }, |
}; |
- AutocompleteInput input(ASCIIToUTF16("Test"), string16::npos, string16(), |
- GURL(), AutocompleteInput::INVALID_SPEC, true, true, |
+ AutocompleteInput input(ASCIIToUTF16("Test"), base::string16::npos, |
+ base::string16(), GURL(), |
+ AutocompleteInput::INVALID_SPEC, true, true, |
true, AutocompleteInput::BEST_MATCH); |
- string16 url(ASCIIToUTF16("http://example.com")); |
+ base::string16 url(ASCIIToUTF16("http://example.com")); |
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { |
ExtensionAppProvider::ExtensionApp extension_app = |
{ASCIIToUTF16(cases[i].name), url, true}; |
@@ -147,7 +149,7 @@ TEST_F(ExtensionAppProviderTest, CreateMatchSanitize) { |
app_provider_->CreateAutocompleteMatch(input, |
extension_app, |
0, |
- string16::npos); |
+ base::string16::npos); |
EXPECT_EQ(ASCIIToUTF16(cases[i].match_contents), match.contents); |
} |
} |