| Index: content/browser/renderer_host/render_view_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
| index ec0341b74b0aa7b811fce99a3e10a2695a8732ca..8233aaed82b665c914e581fdef42bc536eab53ba 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_view_host_impl.cc
|
| @@ -494,35 +494,7 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {
|
| prefs.strict_powerful_feature_restrictions = command_line.HasSwitch(
|
| switches::kEnableStrictPowerfulFeatureRestrictions);
|
|
|
| - std::string v8_cache_options =
|
| - command_line.GetSwitchValueASCII(switches::kV8CacheOptions);
|
| - if (v8_cache_options.empty())
|
| - v8_cache_options = base::FieldTrialList::FindFullName("V8CacheOptions");
|
| - if (v8_cache_options == "parse") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_PARSE;
|
| - } else if (v8_cache_options == "code") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_CODE;
|
| - } else if (v8_cache_options == "code-compressed") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_CODE_COMPRESSED;
|
| - } else if (v8_cache_options == "none") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_NONE;
|
| - } else if (v8_cache_options == "parse-memory") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_PARSE_MEMORY;
|
| - } else if (v8_cache_options == "heuristics") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS;
|
| - } else if (v8_cache_options == "heuristics-mobile") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_MOBILE;
|
| - } else if (v8_cache_options == "heuristics-default") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_DEFAULT;
|
| - } else if (v8_cache_options == "heuristics-default-mobile") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_HEURISTICS_DEFAULT_MOBILE;
|
| - } else if (v8_cache_options == "recent") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_RECENT;
|
| - } else if (v8_cache_options == "recent-small") {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_RECENT_SMALL;
|
| - } else {
|
| - prefs.v8_cache_options = V8_CACHE_OPTIONS_DEFAULT;
|
| - }
|
| + prefs.v8_cache_options = GetV8CacheOptions();
|
|
|
| GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs);
|
| return prefs;
|
|
|