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

chrome/browser/search_engines/template_url_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 44 matching lines @@
 // TemplateURLService takes ownership of any TemplateURL passed to it. If there
 // is a WebDataService, deletion is handled by WebDataService, otherwise
 // TemplateURLService handles deletion.
 
 class TemplateURLService : public WebDataServiceConsumer,
                            public ProfileKeyedService,
                            public NotificationObserver {
  public:
   typedef std::map<std::string, std::string> QueryTerms;
   typedef std::vector<const TemplateURL*> TemplateURLVector;
+  // Type for a static function pointer that acts as a time source.
+  typedef base::Time(TimeProvider)();
 
   // Struct used for initializing the data store with fake data.
   // Each initializer is mapped to a TemplateURL.
   struct Initializer {
     const char* const keyword;
     const char* const url;
     const char* const content;
   };
 
   explicit TemplateURLService(Profile* profile);
@@ skipping 158 matching lines @@
     search_engine_dialog_chosen_slot_ = slot;
   }
 
   int GetSearchEngineDialogSlot() const {
     return search_engine_dialog_chosen_slot_;
   }
 
   // Registers the preferences used to save a TemplateURL to prefs.
   static void RegisterUserPrefs(PrefService* prefs);
 
+#if defined(UNIT_TEST)
+  // Set a different time provider function, such as
+  // base::MockTimeProvider::StaticNow, when testing calls to base::Time::Now.
+  void set_time_provider(TimeProvider* time_provider) {
+    time_provider_ = time_provider;
+  }
+#endif
+
  protected:
   // Cover method for the method of the same name on the HistoryService.
   // url is the one that was visited with the given search terms.
   //
   // This exists and is virtual for testing.
   virtual void SetKeywordSearchTermsForURL(const TemplateURL* t_url,
                                            const GURL& url,
                                            const string16& term);
 
  private:
@@ skipping 180 matching lines @@
   // preferences have changed.
   scoped_ptr<PrefSetObserver> default_search_prefs_;
 
   // ID assigned to next TemplateURL added to this model. This is an ever
   // increasing integer that is initialized from the database.
   TemplateURLID next_id_;
 
   // List of extension IDs waiting for Load to have keywords registered.
   std::vector<std::string> pending_extension_ids_;
 
+  // Function returning current time in base::Time units.
+  TimeProvider* time_provider_;
+
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_