Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / autocomplete / builtin_provider_unittest.cc

diff --git a/src/chrome/browser/autocomplete/builtin_provider_unittest.cc b/src/chrome/browser/autocomplete/builtin_provider_unittest.cc
index 7ed142d..916c314 100644 (file)
--- a/src/chrome/browser/autocomplete/builtin_provider_unittest.cc
+++ b/src/chrome/browser/autocomplete/builtin_provider_unittest.cc
@@ -27,10 +27,10 @@ class BuiltinProviderTest : public testing::Test {
   };
 
   BuiltinProviderTest() : provider_(NULL) {}
-  virtual ~BuiltinProviderTest() {}
+  ~BuiltinProviderTest() override {}
 
-  virtual void SetUp() OVERRIDE { provider_ = new BuiltinProvider(); }
-  virtual void TearDown() OVERRIDE { provider_ = NULL; }
+  void SetUp() override { provider_ = new BuiltinProvider(); }
+  void TearDown() override { provider_ = NULL; }
 
   void RunTest(const TestData cases[], size_t num_cases) {
     ACMatches matches;
@@ -38,7 +38,7 @@ class BuiltinProviderTest : public testing::Test {
       SCOPED_TRACE(base::StringPrintf(
           "case %" PRIuS ": %s", i, base::UTF16ToUTF8(cases[i].input).c_str()));
       const AutocompleteInput input(cases[i].input, base::string16::npos,
-                                    base::string16(), GURL(),
+                                    std::string(), GURL(),
                                     metrics::OmniboxEventProto::INVALID_SPEC,
                                     true, false, true, true,
                                     ChromeAutocompleteSchemeClassifier(NULL));