Added last_modified field to TemplateURL and database. Updated unit tests, including refactoring ...

chrome/browser/webdata/keyword_table_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/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
+using base::TimeDelta;
 
 class KeywordTableTest : public testing::Test {
  public:
   KeywordTableTest() {}
   virtual ~KeywordTableTest() {}
 
  protected:
   virtual void SetUp() {
     PathService::Get(chrome::DIR_TEST_DATA, &file_);
     const std::string test_db = "TestWebDatabase" +
@@ skipping 38 matching lines @@
   TemplateURL template_url;
   template_url.set_short_name(ASCIIToUTF16("short_name"));
   template_url.set_keyword(ASCIIToUTF16("keyword"));
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://google.com/");
   template_url.SetFaviconURL(favicon_url);
   template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   Time created_time = Time::Now();
   template_url.set_date_created(created_time);
+  Time last_modified_time = created_time + TimeDelta::FromSeconds(10);
+  template_url.set_last_modified(last_modified_time);
   template_url.set_show_in_default_list(true);
   template_url.set_originating_url(originating_url);
   template_url.set_usage_count(32);
   template_url.add_input_encoding("UTF-8");
   template_url.add_input_encoding("UTF-16");
   set_prepopulate_id(&template_url, 10);
   set_logo_id(&template_url, 1000);
   template_url.set_created_by_policy(true);
   template_url.SetInstantURL("http://instant/", 0, 0);
   SetID(1, &template_url);
@@ skipping 12 matching lines @@
 
   EXPECT_FALSE(restored_url->autogenerate_keyword());
 
   EXPECT_TRUE(favicon_url == restored_url->GetFaviconURL());
 
   EXPECT_TRUE(restored_url->safe_for_autoreplace());
 
   // The database stores time only at the resolution of a second.
   EXPECT_EQ(created_time.ToTimeT(), restored_url->date_created().ToTimeT());
 
+  EXPECT_EQ(last_modified_time.ToTimeT(),
+            restored_url->last_modified().ToTimeT());
+
   EXPECT_TRUE(restored_url->show_in_default_list());
 
   EXPECT_EQ(GetID(&template_url), GetID(restored_url));
 
   EXPECT_TRUE(originating_url == restored_url->originating_url());
 
   EXPECT_EQ(32, restored_url->usage_count());
 
   ASSERT_EQ(2U, restored_url->input_encodings().size());
   EXPECT_EQ("UTF-8", restored_url->input_encodings()[0]);
@@ skipping 122 matching lines @@
   EXPECT_EQ(1U, template_urls.size());
   const TemplateURL* restored_url = template_urls.front();
 
   EXPECT_EQ(template_url.short_name(), restored_url->short_name());
   EXPECT_EQ(template_url.keyword(), restored_url->keyword());
   EXPECT_TRUE(!restored_url->GetFaviconURL().is_valid());
   EXPECT_TRUE(restored_url->safe_for_autoreplace());
   EXPECT_EQ(GetID(&template_url), GetID(restored_url));
   delete restored_url;
 }