Handful of related instant changes:

. Makes the code for running the promo more real. We're not ready to
  flip it on yet, so it isn't enabled.
. Nukes verbatim from about:flags and instead randomly chooses
  verbatim/predictive when the user opts in. We're doing this to try
  and see if we get feedback as to which one folks like more. Windows
  preferences shows you which one you get (by way of an obscure
  label). I'll change gtk do to that shortly too.
. Adds metrics.

And a couple of random style issues I encountered in some files.

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/5023001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66187 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 503c25c..fa593b3 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -180,9 +180,10 @@ class TestingProfile : public Profile {
   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() {
@@ -306,6 +307,7 @@ class TestingProfile : public Profile {
   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_;