diff options
| author | hjd <hjd@chromium.org> | 2014-10-02 08:19:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-02 15:19:21 +0000 |
| commit | 4afe16abd65dc99c48f8bb318c013d70e78cdd9f (patch) | |
| tree | 38c73757c1fc86d54e1869af7fe4a6ef0e04ada3 /content/browser/net/sqlite_persistent_cookie_store.cc | |
| parent | b5dfb13415c6ed734461aabe66372903df3da682 (diff) | |
| download | chromium_src-4afe16abd65dc99c48f8bb318c013d70e78cdd9f.zip chromium_src-4afe16abd65dc99c48f8bb318c013d70e78cdd9f.tar.gz chromium_src-4afe16abd65dc99c48f8bb318c013d70e78cdd9f.tar.bz2 | |
Remove workaround for Cookie Manager Command Line
BUG=331424
Review URL: https://codereview.chromium.org/294973002
Cr-Commit-Position: refs/heads/master@{#297832}
Diffstat (limited to 'content/browser/net/sqlite_persistent_cookie_store.cc')
| -rw-r--r-- | content/browser/net/sqlite_persistent_cookie_store.cc | 11 |
1 files changed, 1 insertions, 10 deletions
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); } |