More misc. cleanups to minimize future refactoring diffs.

chrome/browser/search_engines/template_url_service_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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_split.h"
@@ skipping 473 matching lines @@
             TemplateURLService::GenerateKeyword(GURL("http://blah/foo"), true));
   ASSERT_EQ(ASCIIToUTF16("blah"),
             TemplateURLService::GenerateKeyword(GURL("http://blah/foo"),
                 false));
   // FTP shouldn't generate a keyword.
   ASSERT_EQ(string16(),
             TemplateURLService::GenerateKeyword(GURL("ftp://blah/"), true));
   // Make sure we don't get a trailing /
   ASSERT_EQ(ASCIIToUTF16("blah"),
             TemplateURLService::GenerateKeyword(GURL("http://blah/"), true));
+  // Don't generate the empty string.
+  ASSERT_EQ(ASCIIToUTF16("www"),
+            TemplateURLService::GenerateKeyword(GURL("http://www."), false));
 }
 
 TEST_F(TemplateURLServiceTest, GenerateSearchURL) {
   scoped_refptr<TestGenerateSearchURL> test_generate_search_url(
       new TestGenerateSearchURL(NULL));
   test_generate_search_url->RunTest();
   EXPECT_TRUE(test_generate_search_url->passed());
 }
 
 TEST_F(TemplateURLServiceTest, GenerateSearchURLUsingTermsData) {
@@ skipping 284 matching lines @@
   scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
 
   // Reset the model and don't load it. The template url we set as the default
   // should be pulled from prefs now.
   test_util_.ResetModel(false);
 
   // NOTE: This doesn't use AssertEquals as only a subset of the TemplateURLs
   // value are persisted to prefs.
   const TemplateURL* default_turl = model()->GetDefaultSearchProvider();
   ASSERT_TRUE(default_turl);
-  ASSERT_EQ("http://url", default_turl->url());
-  ASSERT_EQ("http://url2", default_turl->suggestions_url());
+  EXPECT_EQ(ASCIIToUTF16("a"), default_turl->short_name());
+  EXPECT_EQ("http://url", default_turl->url());
+  EXPECT_EQ("http://url2", default_turl->suggestions_url());
   EXPECT_EQ("http://instant", default_turl->instant_url());
-  ASSERT_EQ(ASCIIToUTF16("a"), default_turl->short_name());
-  ASSERT_EQ(id, default_turl->id());
+  EXPECT_EQ(id, default_turl->id());
 
   // Now do a load and make sure the default search provider really takes.
   test_util_.VerifyLoad();
 
   ASSERT_TRUE(model()->GetDefaultSearchProvider());
   AssertEquals(*cloned_url, *model()->GetDefaultSearchProvider());
 }
 
 TEST_F(TemplateURLServiceTest, BuildQueryTerms) {
   struct TestData {
@@ skipping 517 matching lines @@
 
   // Reload the model to verify it was actually saved to the database and
   // assigned a new GUID when brought back.
   test_util_.ResetModel(true);
   ASSERT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
   const TemplateURL* loaded_url =
       model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword"));
   ASSERT_TRUE(loaded_url != NULL);
   ASSERT_FALSE(loaded_url->sync_guid().empty());
 }