Misc. small cleanups to minimize TemplateURL 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 131 matching lines @@
 }
 
 std::string TestSearchTermsData::GoogleBaseURLValue() const {
   return google_base_url_;
 }
 
 };  // namespace
 
 
 // TemplateURLServiceTest -----------------------------------------------------
+
 class TemplateURLServiceTest : public testing::Test {
  public:
   TemplateURLServiceTest();
 
   // testing::Test
   virtual void SetUp();
   virtual void TearDown();
 
   TemplateURL* AddKeywordWithDate(const std::string& keyword,
                                   bool autogenerate_keyword,
@@ skipping 993 matching lines @@
   // Wait for any saves to finish.
   test_util_.BlockTillServiceProcessesRequests();
 }
 
 // Simulates failing to load the webdb and makes sure the default search
 // provider is valid.
 TEST_F(TemplateURLServiceTest, FailedInit) {
   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);
 
   test_util_.ResetModel(false);
   model()->Load();
   test_util_.BlockTillServiceProcessesRequests();
 
   ASSERT_TRUE(model()->GetDefaultSearchProvider());
 }
 
@@ skipping 68 matching lines @@
 
   // Remove all the managed prefs and check that we are no longer managed.
   RemoveManagedDefaultSearchPreferences();
   VerifyObserverFired();
   EXPECT_FALSE(model()->is_default_search_managed());
   EXPECT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
 
   // 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.
   SetManagedDefaultSearchPreferences(false, std::string(), std::string(),
       std::string(), std::string(), std::string(), std::string());
   VerifyObserverFired();
   EXPECT_TRUE(model()->is_default_search_managed());
   EXPECT_TRUE(NULL == model()->GetDefaultSearchProvider());
   EXPECT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
 
@@ skipping 51 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());
 }