Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Side by Side Diff: content/browser/net/sqlite_persistent_cookie_store.cc

Issue 976553002: Remove the '--enable-file-cookies' flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Whole method. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/net/sqlite_persistent_cookie_store.h" 5 #include "content/browser/net/sqlite_persistent_cookie_store.h"
6 6
7 #include <list> 7 #include <list>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
erikwright (departed) 2015/03/30 14:22:30 remove?
16 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
17 #include "base/files/file_util.h" 17 #include "base/files/file_util.h"
18 #include "base/location.h" 18 #include "base/location.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/memory/ref_counted.h" 20 #include "base/memory/ref_counted.h"
21 #include "base/memory/scoped_ptr.h" 21 #include "base/memory/scoped_ptr.h"
22 #include "base/metrics/field_trial.h" 22 #include "base/metrics/field_trial.h"
23 #include "base/metrics/histogram.h" 23 #include "base/metrics/histogram.h"
24 #include "base/sequenced_task_runner.h" 24 #include "base/sequenced_task_runner.h"
25 #include "base/strings/string_util.h" 25 #include "base/strings/string_util.h"
26 #include "base/strings/stringprintf.h" 26 #include "base/strings/stringprintf.h"
27 #include "base/synchronization/lock.h" 27 #include "base/synchronization/lock.h"
28 #include "base/threading/sequenced_worker_pool.h" 28 #include "base/threading/sequenced_worker_pool.h"
29 #include "base/time/time.h" 29 #include "base/time/time.h"
30 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
31 #include "content/public/browser/cookie_store_factory.h" 31 #include "content/public/browser/cookie_store_factory.h"
32 #include "content/public/common/content_switches.h" 32 #include "content/public/common/content_switches.h"
erikwright (departed) 2015/03/30 14:22:30 remove?
33 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 33 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
34 #include "net/cookies/canonical_cookie.h" 34 #include "net/cookies/canonical_cookie.h"
35 #include "net/cookies/cookie_constants.h" 35 #include "net/cookies/cookie_constants.h"
36 #include "net/cookies/cookie_util.h" 36 #include "net/cookies/cookie_util.h"
37 #include "net/extras/sqlite/cookie_crypto_delegate.h" 37 #include "net/extras/sqlite/cookie_crypto_delegate.h"
38 #include "sql/error_delegate_util.h" 38 #include "sql/error_delegate_util.h"
39 #include "sql/meta_table.h" 39 #include "sql/meta_table.h"
40 #include "sql/statement.h" 40 #include "sql/statement.h"
41 #include "sql/transaction.h" 41 #include "sql/transaction.h"
42 #include "storage/browser/quota/special_storage_policy.h" 42 #include "storage/browser/quota/special_storage_policy.h"
(...skipping 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 cookie_monster = 1384 cookie_monster =
1385 new net::CookieMonster(persistent_store, config.cookie_delegate.get()); 1385 new net::CookieMonster(persistent_store, config.cookie_delegate.get());
1386 if ((config.session_cookie_mode == 1386 if ((config.session_cookie_mode ==
1387 CookieStoreConfig::PERSISTANT_SESSION_COOKIES) || 1387 CookieStoreConfig::PERSISTANT_SESSION_COOKIES) ||
1388 (config.session_cookie_mode == 1388 (config.session_cookie_mode ==
1389 CookieStoreConfig::RESTORED_SESSION_COOKIES)) { 1389 CookieStoreConfig::RESTORED_SESSION_COOKIES)) {
1390 cookie_monster->SetPersistSessionCookies(true); 1390 cookie_monster->SetPersistSessionCookies(true);
1391 } 1391 }
1392 } 1392 }
1393 1393
1394 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
1395 switches::kEnableFileCookies)) {
1396 cookie_monster->SetEnableFileScheme(true);
1397 }
1398
1399 return cookie_monster; 1394 return cookie_monster;
1400 } 1395 }
1401 1396
1402 } // namespace content 1397 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698