Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/search_engines/template_url_unittest.cc

 // Copyright (c) 2012 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 "base/base_paths.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
@@ skipping 37 matching lines @@
     const std::string& base_suggest_url) const {
   TestSearchTermsData search_terms_data(base_url);
   EXPECT_EQ(base_suggest_url, search_terms_data.GoogleBaseSuggestURLValue());
 }
 
 
 // Actual tests ---------------------------------------------------------------
 
 TEST_F(TemplateURLTest, Defaults) {
   TemplateURL url;
-  ASSERT_FALSE(url.show_in_default_list());
-  ASSERT_FALSE(url.safe_for_autoreplace());
-  ASSERT_EQ(0, url.prepopulate_id());
+  EXPECT_FALSE(url.show_in_default_list());
+  EXPECT_FALSE(url.safe_for_autoreplace());
+  EXPECT_EQ(0, url.prepopulate_id());
 }
 
 TEST_F(TemplateURLTest, TestValidWithComplete) {
   TemplateURLRef ref("{searchTerms}", 0, 0);
-  ASSERT_TRUE(ref.IsValid());
+  EXPECT_TRUE(ref.IsValid());
 }
 
 TEST_F(TemplateURLTest, URLRefTestSearchTerms) {
   struct SearchTermsCase {
     const char* url;
     const string16 terms;
     const std::string output;
     bool valid_url;
   } search_term_cases[] = {
     { "http://foo{searchTerms}", ASCIIToUTF16("sea rch/bar"),
@@ skipping 183 matching lines @@
         to_wide_cases[i].encoded_search_term);
 
     EXPECT_EQ(to_wide_cases[i].expected_decoded_term, result);
   }
 }
 
 TEST_F(TemplateURLTest, SetFavicon) {
   GURL favicon_url("http://favicon.url");
   TemplateURL url;
   url.SetFaviconURL(favicon_url);
-  ASSERT_EQ(1U, url.image_refs().size());
-  ASSERT_TRUE(favicon_url == url.GetFaviconURL());
+  EXPECT_EQ(1U, url.image_refs().size());
+  EXPECT_EQ(favicon_url, url.GetFaviconURL());
 
   GURL favicon_url2("http://favicon2.url");
   url.SetFaviconURL(favicon_url2);
   EXPECT_EQ(1U, url.image_refs().size());
   EXPECT_EQ(favicon_url2, url.GetFaviconURL());
 }
 
 TEST_F(TemplateURLTest, DisplayURLToURLRef) {
   struct TestData {
     const std::string url;
@@ skipping 240 matching lines @@
 
   // If the TemplateURLRef is prepopulated, we should remove unknown parameters.
   parsed_url = "{fhqwhgads}";
   url_ref.prepopulated_ = true;
   EXPECT_FALSE(url_ref.ParseParameter(0, 10, &parsed_url, &replacements));
   EXPECT_EQ(std::string(), parsed_url);
   EXPECT_TRUE(replacements.empty());
 }
 
 TEST_F(TemplateURLTest, ParseURLEmpty) {
-  TemplateURLRef url_ref("", 0, 0);
+  TemplateURLRef url_ref(std::string(), 0, 0);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ(std::string(),
             url_ref.ParseURL(std::string(), &replacements, &valid));
   EXPECT_TRUE(replacements.empty());
   EXPECT_TRUE(valid);
 }
 
 TEST_F(TemplateURLTest, ParseURLNoTemplateEnd) {
   TemplateURLRef url_ref("{", 0, 0);
@@ skipping 28 matching lines @@
 TEST_F(TemplateURLTest, ParseURLNestedParameter) {
   TemplateURLRef url_ref("{%s", 0, 0);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ("{", url_ref.ParseURL("{{searchTerms}", &replacements, &valid));
   ASSERT_EQ(1U, replacements.size());
   EXPECT_EQ(1U, replacements[0].index);
   EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
   EXPECT_TRUE(valid);
 }