Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: components/omnibox/autocomplete_result_unittest.cc

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/omnibox/autocomplete_result.h" 5 #include "components/omnibox/autocomplete_result.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 AutocompleteResultTest() { 83 AutocompleteResultTest() {
84 // Destroy the existing FieldTrialList before creating a new one to avoid 84 // Destroy the existing FieldTrialList before creating a new one to avoid
85 // a DCHECK. 85 // a DCHECK.
86 field_trial_list_.reset(); 86 field_trial_list_.reset();
87 field_trial_list_.reset(new base::FieldTrialList( 87 field_trial_list_.reset(new base::FieldTrialList(
88 new metrics::SHA1EntropyProvider("foo"))); 88 new metrics::SHA1EntropyProvider("foo")));
89 variations::testing::ClearAllVariationParams(); 89 variations::testing::ClearAllVariationParams();
90 } 90 }
91 91
92 virtual void SetUp() OVERRIDE { 92 virtual void SetUp() override {
93 #if defined(OS_ANDROID) 93 #if defined(OS_ANDROID)
94 TemplateURLPrepopulateData::InitCountryCode( 94 TemplateURLPrepopulateData::InitCountryCode(
95 std::string() /* unknown country code */); 95 std::string() /* unknown country code */);
96 #endif 96 #endif
97 template_url_service_.reset(new TemplateURLService(NULL, 0)); 97 template_url_service_.reset(new TemplateURLService(NULL, 0));
98 template_url_service_->Load(); 98 template_url_service_->Load();
99 } 99 }
100 100
101 // Configures |match| from |data|. 101 // Configures |match| from |data|.
102 static void PopulateAutocompleteMatch(const TestData& data, 102 static void PopulateAutocompleteMatch(const TestData& data,
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 result.Reset(); 834 result.Reset();
835 matches.clear(); 835 matches.clear();
836 836
837 // Case 5: Multiple verbatim matches found in AutocompleteResult. 837 // Case 5: Multiple verbatim matches found in AutocompleteResult.
838 PopulateAutocompleteMatchesFromTestData(kVerbatimMatches, 838 PopulateAutocompleteMatchesFromTestData(kVerbatimMatches,
839 arraysize(kVerbatimMatches), 839 arraysize(kVerbatimMatches),
840 &matches); 840 &matches);
841 result.AppendMatches(matches); 841 result.AppendMatches(matches);
842 EXPECT_FALSE(result.ShouldHideTopMatch()); 842 EXPECT_FALSE(result.ShouldHideTopMatch());
843 } 843 }
OLDNEW
« no previous file with comments | « components/omaha_query_params/omaha_query_params_unittest.cc ('k') | components/omnibox/base_search_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698