summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 20:16:21 +0000
committertburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 20:16:21 +0000
commite20ed12712c5b45299959ea2272f3c9d4b90bcd2 (patch)
tree4493f93773dc6a3578715806f456836a364dc8d4
parent72b82da2f38879f52eb9f23475f83aa1645b132a (diff)
downloadchromium_src-e20ed12712c5b45299959ea2272f3c9d4b90bcd2.zip
chromium_src-e20ed12712c5b45299959ea2272f3c9d4b90bcd2.tar.gz
chromium_src-e20ed12712c5b45299959ea2272f3c9d4b90bcd2.tar.bz2
Add switch to disable the Inifinite Cache.
R=rvargas@chromium.org, jam@chromium.org Review URL: https://codereview.chromium.org/10910281 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156868 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chrome_browser_field_trials.cc7
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
3 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index 3974513..632f4a2 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -569,11 +569,14 @@ void ChromeBrowserFieldTrials::SetUpInfiniteCacheFieldTrial() {
const base::FieldTrial::Probability kDivisor = 100;
#if (defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS))
- const base::FieldTrial::Probability kInfiniteCacheProbability = 0;
+ base::FieldTrial::Probability kInfiniteCacheProbability = 0;
#else
- const base::FieldTrial::Probability kInfiniteCacheProbability = 1;
+ base::FieldTrial::Probability kInfiniteCacheProbability = 1;
#endif
+ if (parsed_command_line_.HasSwitch(switches::kDisableInfiniteCache))
+ kInfiniteCacheProbability = 0;
+
scoped_refptr<base::FieldTrial> trial(
base::FieldTrialList::FactoryGetFieldTrial("InfiniteCache", kDivisor,
"No", 2013, 12, 31, NULL));
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index a968fe5..3752e6d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -328,6 +328,9 @@ const char kDisableImprovedDownloadProtection[] =
// need to update thumbnails.
const char kDisableInBrowserThumbnailing[] = "disable-in-browser-thumbnailing";
+// Disable the Infinite Cache.
+const char kDisableInfiniteCache[] = "disable-infinite-cache";
+
// Disable the internal Flash Player.
const char kDisableInternalFlash[] = "disable-internal-flash";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index a6dce7b..9f86745 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -95,6 +95,7 @@ extern const char kDisableExtensions[];
extern const char kDisableFlashSandbox[];
extern const char kDisableImprovedDownloadProtection[];
extern const char kDisableInBrowserThumbnailing[];
+extern const char kDisableInfiniteCache[];
extern const char kDisableInternalFlash[];
extern const char kDisableIPv6[];
extern const char kDisableIPPooling[];