diff options
4 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/autocomplete/history_contents_provider.cc b/chrome/browser/autocomplete/history_contents_provider.cc index 9eef77c..ce409eb 100644 --- a/chrome/browser/autocomplete/history_contents_provider.cc +++ b/chrome/browser/autocomplete/history_contents_provider.cc @@ -218,7 +218,7 @@ void HistoryContentsProvider::ClassifyDescription( // Classify matches in the title. for (Snippet::MatchPositions::const_iterator i = title_matches.begin(); i != title_matches.end(); ++i) { - if (i->first != offset) { + if (static_cast<size_t>(i->first) != offset) { match->description_class.push_back( ACMatchClassification(offset, ACMatchClassification::NONE)); } diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index 79c7a08..badc300 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -16,9 +16,6 @@ #include "generated_resources.h" -static const wchar_t kSearchDescriptionParameter[](L"%1"); -static const wchar_t kSearchValueParameter[](L"%2"); - // static std::wstring KeywordProvider::SplitReplacementStringFromInput( const std::wstring& input) { diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc index aceab5f..c51e1fa 100644 --- a/chrome/browser/autocomplete/keyword_provider_unittest.cc +++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc @@ -13,7 +13,7 @@ class KeywordProviderTest : public testing::Test { protected: struct test_data { const std::wstring input; - const int num_results; + const size_t num_results; const std::wstring output[3]; }; @@ -66,7 +66,7 @@ void KeywordProviderTest::RunTest( EXPECT_EQ(keyword_cases[i].num_results, matches.size()) << L"Input was: " + keyword_cases[i].input; if (matches.size() == keyword_cases[i].num_results) { - for (int j = 0; j < keyword_cases[i].num_results; ++j) { + for (size_t j = 0; j < keyword_cases[i].num_results; ++j) { EXPECT_EQ(keyword_cases[i].output[j], matches[j].*member); } } diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h index 07eb8c8..2ff00ad 100644 --- a/chrome/browser/autocomplete/search_provider.h +++ b/chrome/browser/autocomplete/search_provider.h @@ -39,10 +39,10 @@ class SearchProvider : public AutocompleteProvider, SearchProvider(ACProviderListener* listener, Profile* profile) : AutocompleteProvider(listener, profile, "Search"), last_default_provider_(NULL), - fetcher_(NULL), - history_request_pending_(false), have_history_results_(false), + history_request_pending_(false), suggest_results_pending_(false), + fetcher_(NULL), have_suggest_results_(false) { } |