Move the cookie store implementation into its own directory.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index a8500417f8f3748b20b0017a6071129fcdf1ad3a..cf97e8ebb3107e68c2245f8874b223e5f8cbed95 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -75,13 +75,6 @@
         'base/completion_callback.h',
         'base/connection_type_histograms.cc',
         'base/connection_type_histograms.h',
-        'base/cookie_monster.cc',
-        'base/cookie_monster.h',
-        'base/cookie_options.h',
-        'base/cookie_store.cc',
-        'base/cookie_store.h',
-        'base/cookie_util.cc',
-        'base/cookie_util.h',
         'base/crl_set.cc',
         'base/crl_set.h',
         'base/crypto_module.h',
@@ -276,6 +269,13 @@
         'base/x509_util_openssl.h',
         'base/zap.cc',
         'base/zap.h',
+        'cookies/cookie_monster.cc',
+        'cookies/cookie_monster.h',
+        'cookies/cookie_options.h',
+        'cookies/cookie_store.cc',
+        'cookies/cookie_store.h',
+        'cookies/cookie_util.cc',
+        'cookies/cookie_util.h',
         'disk_cache/addr.cc',
         'disk_cache/addr.h',
         'disk_cache/backend_impl.cc',
@@ -1021,9 +1021,6 @@
         'base/big_endian_unittest.cc',
         'base/cert_database_nss_unittest.cc',
         'base/cert_verifier_unittest.cc',
-        'base/cookie_monster_unittest.cc',
-        'base/cookie_store_unittest.h',
-        'base/cookie_util_unittest.cc',
         'base/crl_set_unittest.cc',
         'base/data_url_unittest.cc',
         'base/default_origin_bound_cert_store_unittest.cc',
@@ -1076,6 +1073,9 @@
         'base/x509_cert_types_unittest.cc',
         'base/x509_util_nss_unittest.cc',
         'base/x509_util_openssl_unittest.cc',
+        'cookies/cookie_monster_unittest.cc',
+        'cookies/cookie_store_unittest.h',
+        'cookies/cookie_util_unittest.cc',
         'disk_cache/addr_unittest.cc',
         'disk_cache/backend_unittest.cc',
         'disk_cache/bitmap_unittest.cc',
@@ -1427,7 +1427,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
-        'base/cookie_monster_perftest.cc',
+        'cookies/cookie_monster_perftest.cc',
         'disk_cache/disk_cache_perftest.cc',
         'proxy/proxy_resolver_perftest.cc',
       ],
@@ -1509,12 +1509,6 @@
       'sources': [
         'base/cert_test_util.cc',
         'base/cert_test_util.h',
-        'base/cookie_monster_store_test.cc',
-        'base/cookie_monster_store_test.h',
-        'base/cookie_store_test_callbacks.cc',
-        'base/cookie_store_test_callbacks.h',
-        'base/cookie_store_test_helpers.cc',
-        'base/cookie_store_test_helpers.h',
         'base/mock_file_stream.cc',
         'base/mock_file_stream.h',
         'base/mock_host_resolver.cc',
@@ -1523,6 +1517,12 @@
         'base/net_test_suite.h',
         'base/test_completion_callback.cc',
         'base/test_completion_callback.h',
+        'cookies/cookie_monster_store_test.cc',
+        'cookies/cookie_monster_store_test.h',
+        'cookies/cookie_store_test_callbacks.cc',
+        'cookies/cookie_store_test_callbacks.h',
+        'cookies/cookie_store_test_helpers.cc',
+        'cookies/cookie_store_test_helpers.h',
         'disk_cache/disk_cache_test_base.cc',
         'disk_cache/disk_cache_test_base.h',
         'disk_cache/disk_cache_test_util.cc',