Update To 11.40.268.0

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

diff --git a/src/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/src/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
index 7c82f82..ddd543e 100644 (file)
--- a/src/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
+++ b/src/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
@@ -22,7 +22,6 @@
 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/in_memory_url_index.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/history/core/browser/url_database.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
@@ -261,8 +260,8 @@ class ShortcutsProviderTest : public testing::Test {
     std::set<ExpectedURLAndAllowedToBeDefault> matches_;
   };
 
-  virtual void SetUp();
-  virtual void TearDown();
+  void SetUp() override;
+  void TearDown() override;
 
   // Fills test data into the provider.
   void FillData(TestShortcutInfo* db, size_t db_size);
@@ -357,7 +356,7 @@ void ShortcutsProviderTest::RunTest(
     std::string expected_top_result,
     base::string16 top_result_inline_autocompletion) {
   base::MessageLoop::current()->RunUntilIdle();
-  AutocompleteInput input(text, base::string16::npos, base::string16(), GURL(),
+  AutocompleteInput input(text, base::string16::npos, std::string(), GURL(),
                           metrics::OmniboxEventProto::INVALID_SPEC,
                           prevent_inline_autocomplete, false, true, true,
                           ChromeAutocompleteSchemeClassifier(&profile_));