Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 123 matching lines @@
   // Verify the TableModel has the new data.
   ASSERT_EQ(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];
   EXPECT_EQ(ASCIIToUTF16("a"), turl->short_name());
   EXPECT_EQ(ASCIIToUTF16("b"), turl->keyword());
-  EXPECT_EQ("http://c", turl->url());
+  ASSERT_TRUE(turl->url() != NULL);
+  EXPECT_EQ("http://c", turl->url()->url());
 }
 
 // Tests modifying a TemplateURL.
 TEST_F(KeywordEditorControllerTest, Modify) {
   controller_->AddTemplateURL(kA, kB, "http://c");
   ClearChangeCount();
 
   // Modify the entry.
   const TemplateURL* turl = model_->GetTemplateURLs()[0];
   controller_->ModifyTemplateURL(turl, kA1, kB1, "http://c1");
 
   // Make sure it was updated appropriately.
   VerifyChangeCount(0, 1, 0, 0);
   EXPECT_EQ(ASCIIToUTF16("a1"), turl->short_name());
   EXPECT_EQ(ASCIIToUTF16("b1"), turl->keyword());
-  EXPECT_EQ("http://c1", turl->url());
+  ASSERT_TRUE(turl->url() != NULL);
+  EXPECT_EQ("http://c1", turl->url()->url());
 }
 
 // Tests making a TemplateURL the default search provider.
 TEST_F(KeywordEditorControllerTest, MakeDefault) {
   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);
@@ skipping 18 matching lines @@
   const TemplateURL* turl1 =
       model_->GetTemplateURLForKeyword(ASCIIToUTF16("b"));
   ASSERT_TRUE(turl1 != NULL);
   const TemplateURL* turl2 =
       model_->GetTemplateURLForKeyword(ASCIIToUTF16("b1"));
   ASSERT_TRUE(turl2 != NULL);
 
   EXPECT_TRUE(controller_->CanMakeDefault(turl1));
   EXPECT_TRUE(controller_->CanMakeDefault(turl2));
 
-  SimulateDefaultSearchIsManaged(turl2->url());
+  SimulateDefaultSearchIsManaged(turl2->url()->url());
   EXPECT_TRUE(model_->is_default_search_managed());
 
   EXPECT_FALSE(controller_->CanMakeDefault(turl1));
   EXPECT_FALSE(controller_->CanMakeDefault(turl2));
 }
 
 // Tests that a TemplateURL can't be edited if it is the managed default search
 // provider.
 TEST_F(KeywordEditorControllerTest, EditManagedDefault) {
   controller_->AddTemplateURL(kA, kB, "http://c{searchTerms}");
   controller_->AddTemplateURL(kA1, kB1, "http://d{searchTerms}");
   ClearChangeCount();
 
   const TemplateURL* turl1 =
       model_->GetTemplateURLForKeyword(ASCIIToUTF16("b"));
   ASSERT_TRUE(turl1 != NULL);
   const TemplateURL* turl2 =
       model_->GetTemplateURLForKeyword(ASCIIToUTF16("b1"));
   ASSERT_TRUE(turl2 != NULL);
 
   EXPECT_TRUE(controller_->CanEdit(turl1));
   EXPECT_TRUE(controller_->CanEdit(turl2));
 
   // Simulate setting a managed default.  This will add another template URL to
   // the model.
-  SimulateDefaultSearchIsManaged(turl2->url());
+  SimulateDefaultSearchIsManaged(turl2->url()->url());
   EXPECT_TRUE(model_->is_default_search_managed());
   EXPECT_TRUE(controller_->CanEdit(turl1));
   EXPECT_TRUE(controller_->CanEdit(turl2));
   EXPECT_FALSE(controller_->CanEdit(model_->GetDefaultSearchProvider()));
 }
 
 TEST_F(KeywordEditorControllerTest, MakeDefaultNoWebData) {
   // Simulate a failure to load Web Data.
   Init(true);
 
@@ skipping 13 matching lines @@
   turl->set_short_name(ASCIIToUTF16("b"));
   model_->Add(turl);
 
   // Table model should have updated.
   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));
 }