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
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5fbfc91..f0a5a6d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2153,8 +2153,8 @@
         'browser/instant/instant_loader_delegate.h',
         'browser/instant/instant_loader_manager.cc',
         'browser/instant/instant_loader_manager.h',
-        'browser/instant/instant_opt_in.cc',
-        'browser/instant/instant_opt_in.h',
+        'browser/instant/promo_counter.cc',
+        'browser/instant/promo_counter.h',
         'browser/intranet_redirect_detector.cc',
         'browser/intranet_redirect_detector.h',
         'browser/io_thread.cc',