Porting in browser/webdata and template_url.

chrome/browser/template_url_parser_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <windows.h>
-
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/browser/template_url_parser.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TemplateURLParserTest : public testing::Test {
@@ skipping 103 matching lines @@
   EXPECT_TRUE(template_url_.GetFavIconURL() ==
               GURL("http://en.wikipedia.org/favicon.ico"));
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_EQ(template_url_.url()->url(),
       L"http://en.wikipedia.org/w/index.php?title=Special:Search&search={searchTerms}");
   EXPECT_TRUE(template_url_.suggestions_url() != NULL);
   EXPECT_TRUE(template_url_.suggestions_url()->SupportsReplacement());
   EXPECT_EQ(template_url_.suggestions_url()->url(),
       L"http://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}");
-  ASSERT_EQ(2, template_url_.input_encodings().size());
+  ASSERT_EQ(2U, template_url_.input_encodings().size());
   EXPECT_EQ("UTF-8", template_url_.input_encodings()[0]);
   EXPECT_EQ("Shift_JIS", template_url_.input_encodings()[1]);
 }
 
 TEST_F(TemplateURLParserTest, NoCrashOnEmptyAttributes) {
   if (IsDisabled())
     return;
   ParseFile(L"url_with_no_attributes.xml", NULL);
 }
 
 // Filters any param which as an occurrence of name_str_ in its name or an
 // occurrence of value_str_ in its value.
 class ParamFilterImpl : public TemplateURLParser::ParameterFilter {
  public:
   ParamFilterImpl(std::string name_str, std::string value_str)
      : name_str_(name_str),
        value_str_(value_str) {
   }
 
   bool KeepParameter(const std::string& key, const std::string& value) {
-    return (name_str_.empty() || key.find(name_str_) == -1) &&
-           (value_str_.empty() || value.find(value_str_) == -1);
+    return (name_str_.empty() || key.find(name_str_) == std::string::npos) &&
+           (value_str_.empty() || value.find(value_str_) == std::string::npos);
   }
 
  private:
   std::string name_str_;
   std::string value_str_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ParamFilterImpl);
 };
 
 TEST_F(TemplateURLParserTest, TestFirefoxEbay) {
   if (IsDisabled())
     return;
   // This file uses the Parameter extension
   // (see http://www.opensearch.org/Specifications/OpenSearch/Extensions/Parameter/1.0)
   ParamFilterImpl filter("ebay", "ebay");
   ParseFile(L"firefox_ebay.xml", &filter);
   ASSERT_TRUE(parse_result_);
   EXPECT_EQ(L"eBay", template_url_.short_name());
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   std::wstring exp_url =
       L"http://search.ebay.com/search/search.dll?query={searchTerms}&"
       L"MfcISAPICommand=GetResult&ht=1&srchdesc=n&maxRecordsReturned=300&"
       L"maxRecordsPerPage=50&SortProperty=MetaEndSort";
   EXPECT_EQ(exp_url, template_url_.url()->url());
-  ASSERT_EQ(1, template_url_.input_encodings().size());
+  ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("ISO-8859-1", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.ebay.com/favicon.ico"),
             template_url_.GetFavIconURL());
 }
 
 TEST_F(TemplateURLParserTest, TestFirefoxWebster) {
   if (IsDisabled())
     return;
   // This XML file uses a namespace.
   ParamFilterImpl filter("", "Mozilla");
   ParseFile(L"firefox_webster.xml", &filter);
   ASSERT_TRUE(parse_result_);
   EXPECT_EQ(L"Webster", template_url_.short_name());
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_EQ(L"http://www.webster.com/cgi-bin/dictionary?va={searchTerms}",
             template_url_.url()->url());
-  ASSERT_EQ(1, template_url_.input_encodings().size());
+  ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("ISO-8859-1", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://www.webster.com/favicon.ico"),
             template_url_.GetFavIconURL());
 }
 
 TEST_F(TemplateURLParserTest, TestFirefoxYahoo) {
   if (IsDisabled())
     return;
   // This XML file uses a namespace.
   ParamFilterImpl filter("", "Mozilla");
   ParseFile(L"firefox_yahoo.xml", &filter);
   ASSERT_TRUE(parse_result_);
   EXPECT_EQ(L"Yahoo", template_url_.short_name());
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_EQ(L"http://ff.search.yahoo.com/gossip?"
             L"output=fxjson&command={searchTerms}",
             template_url_.suggestions_url()->url());
   EXPECT_EQ(L"http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",
             template_url_.url()->url());
-  ASSERT_EQ(1, template_url_.input_encodings().size());
+  ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("UTF-8", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
             template_url_.GetFavIconURL());
 }
 
 // Make sure we ignore POST suggestions (this is the same XML file as
 // firefox_yahoo.xml, the suggestion method was just changed to POST).
 TEST_F(TemplateURLParserTest, TestPostSuggestion) {
   if (IsDisabled())
     return;
   // This XML file uses a namespace.
   ParamFilterImpl filter("", "Mozilla");
   ParseFile(L"post_suggestion.xml", &filter);
   ASSERT_TRUE(parse_result_);
   EXPECT_EQ(L"Yahoo", template_url_.short_name());
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_TRUE(template_url_.suggestions_url() == NULL);
   EXPECT_EQ(L"http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",
             template_url_.url()->url());
-  ASSERT_EQ(1, template_url_.input_encodings().size());
+  ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("UTF-8", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
             template_url_.GetFavIconURL());
 }