Make the test code that changes the GoogleBaseURL do a notification (instead of

directly calling a method) to more closely mimic the way this usually happens.

This is being done to avoid making special "update GoogleBaseURL" method
calls both here and in future tests, and helps ensure that the notification
observer code is set-up correctly.

BUG=38475
TEST=unit_tests --gtest_filter=Temp*

Review URL: http://codereview.chromium.org/3420007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59709 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 1 deletions

diff --git a/chrome/browser/search_engines/template_url_model_test_util.cc b/chrome/browser/search_engines/template_url_model_test_util.cc
index 3f2984b..35e87e8 100644
--- a/chrome/browser/search_engines/template_url_model_test_util.cc
+++ b/chrome/browser/search_engines/template_url_model_test_util.cc
@@ -9,6 +9,8 @@
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
+#include "chrome/common/notification_service.h"
+#include "chrome/common/notification_type.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -187,6 +189,9 @@ std::wstring TemplateURLModelTestUtil::GetAndClearSearchTerm() {
 void TemplateURLModelTestUtil::SetGoogleBaseURL(
     const std::string& base_url) const {
   TemplateURLRef::SetGoogleBaseURL(new std::string(base_url));
+  NotificationService::current()->Notify(NotificationType::GOOGLE_URL_UPDATED,
+                                         NotificationService::AllSources(),
+                                         NotificationService::NoDetails());
 }
 
 WebDataService* TemplateURLModelTestUtil::GetWebDataService() {
diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc
index cf01642..6831c20 100644
--- a/chrome/browser/search_engines/template_url_model_unittest.cc
+++ b/chrome/browser/search_engines/template_url_model_unittest.cc
@@ -733,7 +733,6 @@ TEST_F(TemplateURLModelTest, ChangeGoogleBaseValue) {
   // Change the Google base url.
   test_util_.ResetObserverCount();
   SetGoogleBaseURL("http://foo.com/");
-  model()->GoogleBaseURLChanged();
   VerifyObserverCount(1);
 
   // Make sure the host->TemplateURL map was updated appropriately.