Sanitize PrefStore interface.

chrome/browser/search_engines/template_url_model_test_util.cc

 // Copyright (c) 2010 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 "chrome/browser/search_engines/template_url_model_test_util.h"
 
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/thread.h"
@@ skipping 149 matching lines @@
   TemplateURLRef::SetGoogleBaseURL(NULL);
 
   // Flush the message loop to make Purify happy.
   message_loop_.RunAllPending();
 }
 
 void TemplateURLModelTestUtil::OnTemplateURLModelChanged() {
   changed_count_++;
 }
 
-void TemplateURLModelTestUtil::VerifyObserverCount(int expected_changed_count) {
-  ASSERT_EQ(expected_changed_count, changed_count_);
-  changed_count_ = 0;
+int TemplateURLModelTestUtil::GetObserverCount() {
+  return changed_count_;
 }
 
 void TemplateURLModelTestUtil::ResetObserverCount() {
   changed_count_ = 0;
 }
 
 void TemplateURLModelTestUtil::BlockTillServiceProcessesRequests() {
   WaitForThreadToProcessRequests(BrowserThread::DB);
 }
 
 void TemplateURLModelTestUtil::BlockTillIOThreadProcessesRequests() {
   WaitForThreadToProcessRequests(BrowserThread::IO);
 }
 
 void TemplateURLModelTestUtil::VerifyLoad() {
   ASSERT_FALSE(model()->loaded());
   model()->Load();
   BlockTillServiceProcessesRequests();
-  VerifyObserverCount(1);
+  EXPECT_EQ(1, GetObserverCount());
+  ResetObserverCount();
 }
 
 void TemplateURLModelTestUtil::ChangeModelToLoadState() {
   model()->ChangeToLoadedState();
   // Initialize the web data service so that the database gets updated with
   // any changes made.
   model()->service_ = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
 }
 
 void TemplateURLModelTestUtil::ClearModel() {
@@ skipping 29 matching lines @@
   return profile_->GetTemplateURLModel();
 }
 
 TestingProfile* TemplateURLModelTestUtil::profile() const {
   return profile_.get();
 }
 
 void TemplateURLModelTestUtil::StartIOThread() {
   profile_->StartIOThread();
 }