Handful of related instant changes:

chrome/test/testing_profile.h

 // Copyright (c) 2010 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_TEST_TESTING_PROFILE_H_
 #define CHROME_TEST_TESTING_PROFILE_H_
 #pragma once
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ skipping 162 matching lines @@
   }
   virtual WebDataService* GetWebDataService(ServiceAccessType access) {
     return web_data_service_.get();
   }
   virtual WebDataService* GetWebDataServiceWithoutCreating() {
     return web_data_service_.get();
   }
   virtual PasswordStore* GetPasswordStore(ServiceAccessType access) {
     return NULL;
   }
-  // Initialized the profile's PrefService with an explicity specified
-  // PrefService. Must be called before the TestingProfile.
-  // The profile takes ownership of |pref|.
+  // Sets the profile's PrefService. If a pref service hasn't been explicitly
+  // set GetPrefs creates one, so normally you need not invoke this. If you need
+  // to set a pref service you must invoke this before GetPrefs.
+  // TestingPrefService takes ownership of |prefs|.
   void SetPrefService(PrefService* prefs);
   virtual PrefService* GetPrefs();
   virtual TemplateURLModel* GetTemplateURLModel() {
     return template_url_model_.get();
   }
   virtual TemplateURLFetcher* GetTemplateURLFetcher() {
     return template_url_fetcher_.get();
   }
   virtual history::TopSites* GetTopSites();
   virtual history::TopSites* GetTopSitesWithoutCreating() {
@@ skipping 103 matching lines @@
   void BlockUntilHistoryProcessesPendingRequests();
 
   // Creates and initializes a profile sync service if the tests require one.
   virtual TokenService* GetTokenService();
   virtual ProfileSyncService* GetProfileSyncService();
   virtual ProfileSyncService* GetProfileSyncService(
       const std::string& cros_notes);
   virtual CloudPrintProxyService* GetCloudPrintProxyService() { return NULL; }
   virtual ChromeBlobStorageContext* GetBlobStorageContext() { return NULL; }
   virtual ExtensionInfoMap* GetExtensionInfoMap() { return NULL; }
+  virtual PromoCounter* GetInstantPromoCounter() { return NULL; }
 
  protected:
   base::Time start_time_;
   scoped_ptr<PrefService> prefs_;
   // ref only for right type, lifecycle is managed by prefs_
   TestingPrefService* testing_prefs_;
 
  private:
   // Destroys favicon service if it has been created.
   void DestroyFaviconService();
@@ skipping 96 matching lines @@
 
   virtual ProfileId GetRuntimeId() {
     return original_profile_->GetRuntimeId();
   }
 
  protected:
   Profile* original_profile_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H_