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

chrome/browser/webdata/keyword_table_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 <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ skipping 82 matching lines @@
   EXPECT_EQ(keyword.input_encodings(), restored_keyword->input_encodings());
   EXPECT_EQ(keyword.id(), restored_keyword->id());
   // The database stores time only at the resolution of a second.
   EXPECT_EQ(keyword.date_created().ToTimeT(),
             restored_keyword->date_created().ToTimeT());
   EXPECT_EQ(keyword.last_modified().ToTimeT(),
             restored_keyword->last_modified().ToTimeT());
   EXPECT_EQ(keyword.created_by_policy(), restored_keyword->created_by_policy());
   EXPECT_EQ(keyword.usage_count(), restored_keyword->usage_count());
   EXPECT_EQ(keyword.prepopulate_id(), restored_keyword->prepopulate_id());
-  EXPECT_EQ(keyword.url(), restored_keyword->url());
-  EXPECT_EQ(keyword.instant_url(), restored_keyword->instant_url());
+  ASSERT_TRUE(restored_keyword->url());
+  EXPECT_EQ(keyword.url()->url(), restored_keyword->url()->url());
+  ASSERT_TRUE(restored_keyword->instant_url());
+  EXPECT_EQ(keyword.instant_url()->url(),
+            restored_keyword->instant_url()->url());
   EXPECT_EQ(keyword.favicon_url(), restored_keyword->favicon_url());
 
   EXPECT_TRUE(keyword_table->RemoveKeyword(restored_keyword->id()));
   STLDeleteElements(&keywords);
 
   KeywordTable::Keywords empty_keywords;
   EXPECT_TRUE(keyword_table->GetKeywords(&empty_keywords));
   EXPECT_EQ(0U, empty_keywords.size());
   STLDeleteElements(&empty_keywords);
 }
@@ skipping 56 matching lines @@
   EXPECT_TRUE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
 
   scoped_ptr<TemplateURL> backup_url(
       keyword_table->GetDefaultSearchProviderBackup());
   // Backup URL should have an invalid ID.
   EXPECT_EQ(kInvalidTemplateURLID, backup_url->id());
   EXPECT_EQ(keyword.short_name(), backup_url->short_name());
   EXPECT_EQ(keyword.keyword(), backup_url->keyword());
   EXPECT_EQ(keyword.favicon_url(), backup_url->favicon_url());
-  EXPECT_EQ(keyword.url(), backup_url->url());
+  ASSERT_TRUE(backup_url->url());
+  EXPECT_EQ(keyword.url()->url(), backup_url->url()->url());
   EXPECT_EQ(keyword.safe_for_autoreplace(), backup_url->safe_for_autoreplace());
   EXPECT_EQ(keyword.show_in_default_list(), backup_url->show_in_default_list());
-  EXPECT_EQ(keyword.suggestions_url(), backup_url->suggestions_url());
+  ASSERT_TRUE(backup_url->suggestions_url());
+  EXPECT_EQ(keyword.suggestions_url()->url(),
+            backup_url->suggestions_url()->url());
   EXPECT_FALSE(keyword_table->DidDefaultSearchProviderChange());
 
   // Change the actual setting.
   ASSERT_TRUE(keyword_table->meta_table_->SetValue(
       KeywordTable::kDefaultSearchProviderKey, 2));
   EXPECT_TRUE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(2, keyword_table->GetDefaultSearchProviderID());
 
   backup_url.reset(keyword_table->GetDefaultSearchProviderBackup());
   EXPECT_EQ(kInvalidTemplateURLID, backup_url->id());
   EXPECT_EQ(keyword.short_name(), backup_url->short_name());
   EXPECT_EQ(keyword.keyword(), backup_url->keyword());
   EXPECT_EQ(keyword.favicon_url(), backup_url->favicon_url());
-  EXPECT_EQ(keyword.url(), backup_url->url());
+  ASSERT_TRUE(backup_url->url());
+  EXPECT_EQ(keyword.url()->url(), backup_url->url()->url());
   EXPECT_EQ(keyword.safe_for_autoreplace(), backup_url->safe_for_autoreplace());
   EXPECT_EQ(keyword.show_in_default_list(), backup_url->show_in_default_list());
-  EXPECT_EQ(keyword.suggestions_url(), backup_url->suggestions_url());
+  ASSERT_TRUE(backup_url->suggestions_url());
+  EXPECT_EQ(keyword.suggestions_url()->url(),
+            backup_url->suggestions_url()->url());
   EXPECT_TRUE(keyword_table->DidDefaultSearchProviderChange());
 
   // Change the backup.
   ASSERT_TRUE(keyword_table->meta_table_->SetValue(
       KeywordTable::kDefaultSearchProviderKey, 1));
   ASSERT_TRUE(keyword_table->meta_table_->SetValue(
       KeywordTable::kDefaultSearchIDBackupKey, 2));
   EXPECT_FALSE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
   EXPECT_EQ(NULL, keyword_table->GetDefaultSearchProviderBackup());
@@ skipping 15 matching lines @@
       "DELETE FROM keywords WHERE id=1"));
   ASSERT_TRUE(remove_keyword.Run());
   EXPECT_TRUE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
 
   backup_url.reset(keyword_table->GetDefaultSearchProviderBackup());
   EXPECT_EQ(kInvalidTemplateURLID, backup_url->id());
   EXPECT_EQ(keyword.short_name(), backup_url->short_name());
   EXPECT_EQ(keyword.keyword(), backup_url->keyword());
   EXPECT_EQ(keyword.favicon_url(), backup_url->favicon_url());
-  EXPECT_EQ(keyword.url(), backup_url->url());
+  ASSERT_TRUE(backup_url->url());
+  EXPECT_EQ(keyword.url()->url(), backup_url->url()->url());
   EXPECT_EQ(keyword.safe_for_autoreplace(), backup_url->safe_for_autoreplace());
   EXPECT_EQ(keyword.show_in_default_list(), backup_url->show_in_default_list());
-  EXPECT_EQ(keyword.suggestions_url(), backup_url->suggestions_url());
+  ASSERT_TRUE(backup_url->suggestions_url());
+  EXPECT_EQ(keyword.suggestions_url()->url(),
+            backup_url->suggestions_url()->url());
   EXPECT_TRUE(keyword_table->DidDefaultSearchProviderChange());
 
   // Change keywords backup.
   sql::Statement remove_keyword_backup(keyword_table->db_->GetUniqueStatement(
           "DELETE FROM keywords_backup WHERE id=1"));
   ASSERT_TRUE(remove_keyword_backup.Run());
   EXPECT_FALSE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
   EXPECT_EQ(NULL, keyword_table->GetDefaultSearchProviderBackup());
   EXPECT_TRUE(keyword_table->DidDefaultSearchProviderChange());
@@ skipping 117 matching lines @@
   EXPECT_EQ(keyword.keyword(), restored_keyword->keyword());
   EXPECT_EQ(keyword.autogenerate_keyword(),
             restored_keyword->autogenerate_keyword());
   EXPECT_EQ(keyword.show_in_default_list(),
             restored_keyword->show_in_default_list());
   EXPECT_EQ(keyword.safe_for_autoreplace(),
             restored_keyword->safe_for_autoreplace());
   EXPECT_EQ(keyword.input_encodings(), restored_keyword->input_encodings());
   EXPECT_EQ(keyword.id(), restored_keyword->id());
   EXPECT_EQ(keyword.prepopulate_id(), restored_keyword->prepopulate_id());
-  EXPECT_EQ(keyword.suggestions_url(), restored_keyword->suggestions_url());
+  ASSERT_TRUE(restored_keyword->suggestions_url());
+  EXPECT_EQ(keyword.suggestions_url()->url(),
+            restored_keyword->suggestions_url()->url());
+  ASSERT_TRUE(restored_keyword->instant_url());
   EXPECT_EQ(keyword.favicon_url(), restored_keyword->favicon_url());
-  EXPECT_EQ(keyword.instant_url(), restored_keyword->instant_url());
+  EXPECT_EQ(keyword.instant_url()->url(),
+            restored_keyword->instant_url()->url());
 
   STLDeleteElements(&keywords);
 }
 
 TEST_F(KeywordTableTest, KeywordWithNoFavicon) {
   WebDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
   KeywordTable* keyword_table = db.GetKeywordTable();
 
   TemplateURL keyword;
@@ skipping 11 matching lines @@
 
   EXPECT_EQ(keyword.short_name(), restored_keyword->short_name());
   EXPECT_EQ(keyword.keyword(), restored_keyword->keyword());
   EXPECT_EQ(keyword.safe_for_autoreplace(),
             restored_keyword->safe_for_autoreplace());
   EXPECT_EQ(keyword.id(), restored_keyword->id());
   EXPECT_EQ(keyword.favicon_url(), restored_keyword->favicon_url());
 
   STLDeleteElements(&keywords);
 }