From 4afe16abd65dc99c48f8bb318c013d70e78cdd9f Mon Sep 17 00:00:00 2001 From: hjd Date: Thu, 2 Oct 2014 08:19:02 -0700 Subject: Remove workaround for Cookie Manager Command Line BUG=331424 Review URL: https://codereview.chromium.org/294973002 Cr-Commit-Position: refs/heads/master@{#297832} --- content/browser/net/sqlite_persistent_cookie_store.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'content/browser/net/sqlite_persistent_cookie_store.cc') diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc index b7b5bf5..1009d29 100644 --- a/content/browser/net/sqlite_persistent_cookie_store.cc +++ b/content/browser/net/sqlite_persistent_cookie_store.cc @@ -1317,16 +1317,7 @@ net::CookieStore* CreateCookieStore(const CookieStoreConfig& config) { } } - // In the case of Android WebView, the cookie store may be created - // before the browser process fully initializes -- certainly before - // the main loop ever runs. In this situation, the CommandLine singleton - // will not have been set up. Android tests do not need file cookies - // so always ignore them here. - // - // TODO(ajwong): Remove the InitializedForCurrentProcess() check - // once http://crbug.com/331424 is resolved. - if (base::CommandLine::InitializedForCurrentProcess() && - base::CommandLine::ForCurrentProcess()->HasSwitch( + if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableFileCookies)) { cookie_monster->SetEnableFileScheme(true); } -- cgit v1.1