Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / omnibox / keyword_provider_unittest.cc

diff --git a/src/components/omnibox/keyword_provider_unittest.cc b/src/components/omnibox/keyword_provider_unittest.cc
index 8dd3479..cbfc0b9 100644 (file)
--- a/src/components/omnibox/keyword_provider_unittest.cc
+++ b/src/components/omnibox/keyword_provider_unittest.cc
@@ -21,8 +21,8 @@ namespace {
 
 class TestingSchemeClassifier : public AutocompleteSchemeClassifier {
  public:
-  virtual metrics::OmniboxInputType::Type GetInputTypeForScheme(
-      const std::string& scheme) const OVERRIDE {
+  metrics::OmniboxInputType::Type GetInputTypeForScheme(
+      const std::string& scheme) const override {
     if (net::URLRequest::IsHandledProtocol(scheme))
       return metrics::OmniboxInputType::URL;
     return metrics::OmniboxInputType::INVALID;
@@ -47,10 +47,10 @@ class KeywordProviderTest : public testing::Test {
   };
 
   KeywordProviderTest() : kw_provider_(NULL) { }
-  virtual ~KeywordProviderTest() { }
+  ~KeywordProviderTest() override {}
 
-  virtual void SetUp();
-  virtual void TearDown();
+  void SetUp() override;
+  void TearDown() override;
 
   template<class ResultType>
   void RunTest(TestData<ResultType>* keyword_cases,
@@ -94,7 +94,7 @@ void KeywordProviderTest::RunTest(TestData<ResultType>* keyword_cases,
   for (int i = 0; i < num_cases; ++i) {
     SCOPED_TRACE(keyword_cases[i].input);
     AutocompleteInput input(keyword_cases[i].input, base::string16::npos,
-                            base::string16(), GURL(),
+                            std::string(), GURL(),
                             metrics::OmniboxEventProto::INVALID_SPEC, true,
                             false, true, true, TestingSchemeClassifier());
     kw_provider_->Start(input, false);
@@ -334,9 +334,9 @@ TEST_F(KeywordProviderTest, GetSubstitutingTemplateURLForInput) {
     { "aa foo", base::string16::npos, false, "", "aa foo",
       base::string16::npos },
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
+  for (size_t i = 0; i < arraysize(cases); i++) {
     AutocompleteInput input(
-        ASCIIToUTF16(cases[i].text), cases[i].cursor_position, base::string16(),
+        ASCIIToUTF16(cases[i].text), cases[i].cursor_position, std::string(),
         GURL(), metrics::OmniboxEventProto::INVALID_SPEC, false, false,
         cases[i].allow_exact_keyword_match, true, TestingSchemeClassifier());
     const TemplateURL* url =