Merge 160247 - Remove the InstantDummyTrial from the client.

We now server this completely from the server to avoid confusion about the filtering.

BUG=153549
TEST=These are invisible trials being removed, so there should be no user-visible changes.

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

TBR=stevet@chromium.org
Review URL: https://codereview.chromium.org/11033054

git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@160399 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 73 deletions

diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index 69c1321..4525781c 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/chrome_gpu_util.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/instant/instant_field_trials.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
@@ -116,7 +115,6 @@ void ChromeBrowserFieldTrials::SetupFieldTrials(bool proxy_policy_is_set) {
   if (!proxy_policy_is_set)
     ProxyConnectionsFieldTrial();
   prerender::ConfigurePrefetchAndPrerender(parsed_command_line_);
-  instant::SetupInstantFieldTrials();
   SpdyFieldTrial();
   ConnectBackupJobsFieldTrial();
   WarmConnectionFieldTrial();
diff --git a/chrome/browser/instant/instant_field_trials.cc b/chrome/browser/instant/instant_field_trials.cc
deleted file mode 100644
index d78e631..0000000
--- a/chrome/browser/instant/instant_field_trials.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "chrome/browser/instant/instant_field_trials.h"
-
-#include "base/metrics/field_trial.h"
-#include "chrome/common/metrics/variations/variation_ids.h"
-#include "chrome/common/metrics/variations/variations_util.h"
-
-namespace instant {
-
-void SetupInstantFieldTrials() {
-  const base::FieldTrial::Probability num_buckets = 1000;
-  // Default to 5%.  This number may be overridden by the Variations server.
-  const base::FieldTrial::Probability group_probability = 50;
-  const std::string trial_name = "InstantDummy";
-  const std::string default_group_name = "DefaultGroup";
-  const std::string control_group_name = "Control";
-  const std::string experiment_one_group_name = "Experiment1";
-  const std::string experiment_two_group_name = "Experiment2";
-  scoped_refptr<base::FieldTrial> trial(
-      base::FieldTrialList::FactoryGetFieldTrial(
-          trial_name, num_buckets, default_group_name,
-          2013, 6, 30, NULL));
-  // Give users a consistent experience.
-  if (base::FieldTrialList::IsOneTimeRandomizationEnabled())
-    trial->UseOneTimeRandomization();
-
-  // Create field trial groups.
-  trial->AppendGroup(control_group_name, group_probability);
-  trial->AppendGroup(experiment_one_group_name, group_probability);
-  trial->AppendGroup(experiment_two_group_name, group_probability);
-
-  // Since this is a dummy trial and no feature code is requesting the group,
-  // group() has be to called explicitly to ensure the default group is
-  // selected.
-  trial->group();
-
-  // Setup Google Variation IDs for each group in the field trial so Google
-  // servers are aware of the variants.
-  chrome_variations::AssociateGoogleVariationID(trial_name, default_group_name,
-      chrome_variations::kDummyInstantIDDefault);
-  chrome_variations::AssociateGoogleVariationID(trial_name, control_group_name,
-      chrome_variations::kDummyInstantIDControl);
-  chrome_variations::AssociateGoogleVariationID(trial_name,
-      experiment_one_group_name,
-      chrome_variations::kDummyInstantIDExperimentOne);
-  chrome_variations::AssociateGoogleVariationID(trial_name,
-      experiment_two_group_name,
-      chrome_variations::kDummyInstantIDExperimentTwo);
-}
-
-}  // namespace instant
diff --git a/chrome/browser/instant/instant_field_trials.h b/chrome/browser/instant/instant_field_trials.h
deleted file mode 100644
index 7c52dc8..0000000
--- a/chrome/browser/instant/instant_field_trials.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2012 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_INSTANT_INSTANT_FIELD_TRIALS_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_FIELD_TRIALS_H_
-
-namespace instant {
-
-// Opt the user into any appropriate Instant field trials.
-void SetupInstantFieldTrials();
-
-}  // namespace instant
-
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_FIELD_TRIALS_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0979f60..3072ab2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -909,8 +909,6 @@
         'browser/instant/instant_controller.cc',
         'browser/instant/instant_controller.h',
         'browser/instant/instant_controller_delegate.h',
-        'browser/instant/instant_field_trials.h',
-        'browser/instant/instant_field_trials.cc',
         'browser/instant/instant_loader.cc',
         'browser/instant/instant_loader.h',
         'browser/instant/instant_loader_delegate.h',