Handle TemplateURLService load failure better

chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

Index: chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
index f13247e7527459c2e2072ac0272bb61b626c874d..4778ab4ece7ea142183caa17363c901ec10e3bbc 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -125,6 +125,7 @@ void KeywordEditorControllerTest::Init(bool simulate_load_failure) {
 
 // Tests adding a TemplateURL.
 TEST_F(KeywordEditorControllerTest, Add) {
+  int original_row_count = table_model()->RowCount();

[Peter Kasting, 2014/05/05 18:46:24]

This file comes directly from your CL you sent me for review -- turns out I need
many of the same things in order for my tests to pass, and these changes are
just more correct in general than the existing code anyway.

   controller_->AddTemplateURL(kA, kB, "http://c");
 
   // Verify the observer was notified.
@@ -133,13 +134,11 @@ TEST_F(KeywordEditorControllerTest, Add) {
     return;
 
   // Verify the TableModel has the new data.
-  ASSERT_EQ(1, table_model()->RowCount());
+  ASSERT_EQ(original_row_count + 1, table_model()->RowCount());
 
-  // Verify the TemplateURLService has the new entry.
-  ASSERT_EQ(1U, model_->GetTemplateURLs().size());
-
-  // Verify the entry is what we added.
-  const TemplateURL* turl = model_->GetTemplateURLs()[0];
+  // Verify the TemplateURLService has the new data.
+  const TemplateURL* turl = model_->GetTemplateURLForKeyword(kB);
+  ASSERT_TRUE(turl);
   EXPECT_EQ(ASCIIToUTF16("a"), turl->short_name());
   EXPECT_EQ(ASCIIToUTF16("b"), turl->keyword());
   EXPECT_EQ("http://c", turl->url());
@@ -163,12 +162,12 @@ TEST_F(KeywordEditorControllerTest, Modify) {
 
 // Tests making a TemplateURL the default search provider.
 TEST_F(KeywordEditorControllerTest, MakeDefault) {
-  controller_->AddTemplateURL(kA, kB, "http://c{searchTerms}");
+  int index = controller_->AddTemplateURL(kA, kB, "http://c{searchTerms}");
   ClearChangeCount();
 
-  const TemplateURL* turl = model_->GetTemplateURLs()[0];
-  int new_default = controller_->MakeDefaultTemplateURL(0);
-  EXPECT_EQ(0, new_default);
+  const TemplateURL* turl = model_->GetTemplateURLForKeyword(kB);
+  int new_default = controller_->MakeDefaultTemplateURL(index);
+  EXPECT_EQ(index, new_default);
   // Making an item the default sends a handful of changes. Which are sent isn't
   // important, what is important is 'something' is sent.
   ASSERT_TRUE(items_changed_count_ > 0 || added_count_ > 0 ||
@@ -176,7 +175,7 @@ TEST_F(KeywordEditorControllerTest, MakeDefault) {
   ASSERT_TRUE(model_->GetDefaultSearchProvider() == turl);
 
   // Making it default a second time should fail.
-  new_default = controller_->MakeDefaultTemplateURL(0);
+  new_default = controller_->MakeDefaultTemplateURL(index);
   EXPECT_EQ(-1, new_default);
 }
 
@@ -234,17 +233,19 @@ TEST_F(KeywordEditorControllerTest, MakeDefaultNoWebData) {
   // Simulate a failure to load Web Data.
   Init(true);
 
-  controller_->AddTemplateURL(kA, kB, "http://c{searchTerms}");
+  int index = controller_->AddTemplateURL(kA, kB, "http://c{searchTerms}");
   ClearChangeCount();
 
   // This should not result in a crash.
-  int new_default = controller_->MakeDefaultTemplateURL(0);
-  EXPECT_EQ(0, new_default);
+  int new_default = controller_->MakeDefaultTemplateURL(index);
+  EXPECT_EQ(index, new_default);
 }
 
 // Mutates the TemplateURLService and make sure table model is updating
 // appropriately.
 TEST_F(KeywordEditorControllerTest, MutateTemplateURLService) {
+  int original_row_count = table_model()->RowCount();
+
   TemplateURLData data;
   data.short_name = ASCIIToUTF16("b");
   data.SetKeyword(ASCIIToUTF16("a"));
@@ -255,6 +256,6 @@ TEST_F(KeywordEditorControllerTest, MutateTemplateURLService) {
   VerifyChangeCount(1, 0, 0, 0);
 
   // And should contain the newly added TemplateURL.
-  ASSERT_EQ(1, table_model()->RowCount());
-  ASSERT_EQ(0, table_model()->IndexOfTemplateURL(turl));
+  ASSERT_EQ(original_row_count + 1, table_model()->RowCount());
+  ASSERT_GE(table_model()->IndexOfTemplateURL(turl), 0);
 }