Finishing the startup performance experiment.

BUG=164227

Review URL: https://chromiumcodereview.appspot.com/12211053

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

2 files changed, 2 insertions, 35 deletions

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 502ff85..6139a13 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -39,9 +39,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #endif
 
-// TODO(vadimt): Remove once the startup time experiment ends.
-#include "chrome/common/chrome_version_info.h"
-
 namespace extensions {
 
 namespace {
@@ -417,35 +414,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
 #endif
 
 #if defined(ENABLE_GOOGLE_NOW)
-  // TEMPORARY CODE: We are running an experiment to measure how loading the
-  // Google Now component extension affects browser startup time. To get
-  // reliable results, we need to land a temporary change that enables the
-  // extension without a flag in Canary. Then, we'll see what performance bots
-  // will say. After this, we'll let Canary users install the build, and watch
-  // startup time histograms. After we have the data, we'll undo the change, and
-  // will load the extension only under the flag.
-  // The experiment will be rolled back within 1 week from checking in, which is
-  // definitely before 2/12/2013.
-  // While the experiment is running, Canary Chrome will load the Google Now
-  // component extension on startup. While Chrome is running, the extension will
-  // repeat the following every 5 min:
-  // 1. Get location of the computer. Sometimes this will result in a Wifi scan
-  // and sending a request to Google location-based services to get location.
-  // The location will not be sent back to Google, saved to disk or associated
-  // with the user.
-  // 2. Issue a XMLHttpRequest to a URL that turns to be a not existing local
-  // file. So, the request will fail every time.
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-
-  // TODO(vadimt): Unconditional loading of the extension is enabled for Canary
-  // and for unofficial builds; remove after enough data is generated, perhaps
-  // by 2/12/13.
-  // http://crbug.com/164227
-
-  // Loading Google Now component if the flag is specified or if this is an
-  // unofficial or Canary build.
-  if (channel <= chrome::VersionInfo::CHANNEL_CANARY ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableGoogleNowIntegration)) {
     Add(IDR_GOOGLE_NOW_MANIFEST, FilePath(FILE_PATH_LITERAL("google_now")));
   }
diff --git a/chrome/browser/resources/google_now/manifest.json b/chrome/browser/resources/google_now/manifest.json
index 1f3d9fc..5242ec6 100644
--- a/chrome/browser/resources/google_now/manifest.json
+++ b/chrome/browser/resources/google_now/manifest.json
@@ -9,9 +9,7 @@
     // TODO(vadimt): Replace <all_urls> with real URL patterns once we know
     // them.
     "<all_urls>",
-    // TODO(vadimt): Uncomment "experimental" permission once the startup time
-    // experiment is over.
-    //"experimental",
+    "experimental",
     "alarms"
   ],
   "manifest_version": 2,