Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/search_engines/template_url_service_unittest.cc

Index: chrome/browser/search_engines/template_url_service_unittest.cc
===================================================================
--- chrome/browser/search_engines/template_url_service_unittest.cc	(revision 128075)
+++ chrome/browser/search_engines/template_url_service_unittest.cc	(working copy)
@@ -149,6 +149,7 @@
 
 
 // TemplateURLServiceTest -----------------------------------------------------
+
 class TemplateURLServiceTest : public testing::Test {
  public:
   TemplateURLServiceTest();
@@ -1162,7 +1163,8 @@
   test_util_.VerifyLoad();
 
   test_util_.ClearModel();
-  WebDataService* web_service = test_util_.GetWebDataService();
+  WebDataService* web_service =
+      test_util_.profile()->GetWebDataService(Profile::EXPLICIT_ACCESS);
   web_service->UnloadDatabase();
   web_service->set_failed_init(true);
 
@@ -1251,8 +1253,7 @@
   // The default should now be the first URL added
   const TemplateURL* actual_final_managed_default =
       model()->GetDefaultSearchProvider();
-  ExpectSimilar(actual_final_managed_default,
-      model()->GetTemplateURLs()[0]);
+  ExpectSimilar(model()->GetTemplateURLs()[0], actual_final_managed_default);
   EXPECT_EQ(actual_final_managed_default->show_in_default_list(), true);
 
   // Disable the default search provider through policy.