Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/search_engines/template_url_fetcher_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/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 182 matching lines @@
                 TemplateURLFetcher::AUTODETECTED_PROVIDER, true);
   ASSERT_EQ(0, add_provider_called_);
   ASSERT_EQ(0, callbacks_destroyed_);
 
   struct {
     std::string description;
     std::string osdd_file_name;
     string16 keyword;
     TemplateURLFetcher::ProviderType provider_type;
   } test_cases[] = {
-      { "Duplicate keyword and osdd url with autodetected provider.",
-        osdd_file_name, keyword, TemplateURLFetcher::AUTODETECTED_PROVIDER },
-      { "Duplicate keyword and osdd url with explicit provider.",
-        osdd_file_name, keyword, TemplateURLFetcher::EXPLICIT_PROVIDER },
-      { "Duplicate osdd url with explicit provider.",
-        osdd_file_name, keyword + ASCIIToUTF16("1"),
-        TemplateURLFetcher::EXPLICIT_PROVIDER },
-      { "Duplicate keyword with explicit provider.",
-        osdd_file_name + "1", keyword, TemplateURLFetcher::EXPLICIT_PROVIDER }
+      { "Duplicate osdd url with autodetected provider.", osdd_file_name,
+        keyword + ASCIIToUTF16("1"),
+        TemplateURLFetcher::AUTODETECTED_PROVIDER },
+      { "Duplicate keyword with autodetected provider.", osdd_file_name + "1",
+        keyword, TemplateURLFetcher::AUTODETECTED_PROVIDER },
+      { "Duplicate osdd url with explicit provider.", osdd_file_name,
+        string16(), TemplateURLFetcher::EXPLICIT_PROVIDER },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     StartDownload(test_cases[i].keyword, test_cases[i].osdd_file_name,
                   test_cases[i].provider_type, false);
     ASSERT_EQ(
         1,
         test_util_.profile()->GetTemplateURLFetcher()->requests_count()) <<
         test_cases[i].description;
     ASSERT_EQ(i + 1, static_cast<size_t>(callbacks_destroyed_));
@@ skipping 95 matching lines @@
   StartDownload(keyword, osdd_file_name,
                 TemplateURLFetcher::EXPLICIT_PROVIDER, true);
   ASSERT_EQ(0, add_provider_called_);
   ASSERT_EQ(1, callbacks_destroyed_);
 
   WaitForDownloadToFinish();
   ASSERT_EQ(1, add_provider_called_);
   ASSERT_EQ(2, callbacks_destroyed_);
   ASSERT_TRUE(last_callback_template_url_.get());
 }