Adding a sync_guid field to TemplateURL. Adding appropriate database migration changes and tests.

chrome/browser/search_engines/template_url_service_unittest.cc

 // 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/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/test/mock_time_provider.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 148 matching lines @@
     ASSERT_EQ(expected.keyword(), actual.keyword());
     ASSERT_EQ(expected.short_name(), actual.short_name());
     ASSERT_EQ(JoinString(expected.input_encodings(), ';'),
               JoinString(actual.input_encodings(), ';'));
     ASSERT_TRUE(expected.GetFaviconURL() == actual.GetFaviconURL());
     ASSERT_EQ(expected.id(), actual.id());
     ASSERT_EQ(expected.safe_for_autoreplace(), actual.safe_for_autoreplace());
     ASSERT_EQ(expected.show_in_default_list(), actual.show_in_default_list());
     ASSERT_TRUE(expected.date_created() == actual.date_created());
     ASSERT_TRUE(expected.last_modified() == actual.last_modified());
+    ASSERT_EQ(expected.sync_guid(), actual.sync_guid());
   }
 
   // Checks that the two TemplateURLs are similar. It does not check the id, the
   // date_created or the last_modified time.  Neither pointer should be NULL.
   void ExpectSimilar(const TemplateURL* expected, const TemplateURL* actual) {
     ASSERT_TRUE(expected != NULL);
     ASSERT_TRUE(actual != NULL);
     EXPECT_TRUE(TemplateURLRef::SameUrlRefs(expected->url(), actual->url()));
     EXPECT_TRUE(TemplateURLRef::SameUrlRefs(expected->suggestions_url(),
                                             actual->suggestions_url()));
@@ skipping 210 matching lines @@
   const size_t initial_count = model()->GetTemplateURLs().size();
 
   TemplateURL* t_url = new TemplateURL();
   t_url->SetURL("http://www.google.com/foo/bar", 0, 0);
   t_url->set_keyword(ASCIIToUTF16("keyword"));
   t_url->set_short_name(ASCIIToUTF16("google"));
   GURL favicon_url("http://favicon.url");
   t_url->SetFaviconURL(favicon_url);
   t_url->set_date_created(Time::FromTimeT(100));
   t_url->set_last_modified(Time::FromTimeT(100));
+  t_url->set_sync_guid("00000000-0000-0000-0000-000000000001");
   t_url->set_safe_for_autoreplace(true);
   model()->Add(t_url);
   ASSERT_TRUE(model()->CanReplaceKeyword(ASCIIToUTF16("keyword"),
                                          GURL(), NULL));
   VerifyObserverCount(1);
   BlockTillServiceProcessesRequests();
   // We need to clone as model takes ownership of TemplateURL and will
   // delete it.
   TemplateURL cloned_url(*t_url);
   ASSERT_EQ(1 + initial_count, model()->GetTemplateURLs().size());
@@ skipping 826 matching lines @@
   model()->SetDefaultSearchProvider(t_url);
   EXPECT_EQ(t_url, model()->GetDefaultSearchProvider());
 
   // Now reset the model again but load it after setting the preferences.
   ResetModel(false);
   SetManagedDefaultSearchPreferences(false, "", "", "", "", "", "");
   VerifyLoad();
   EXPECT_TRUE(model()->is_default_search_managed());
   EXPECT_TRUE(model()->GetDefaultSearchProvider() == NULL);
 }