Reland "Moves SQLitePersistentCookieStore to net/extras/sqlite."

content/content_tests.gypi

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 461 matching lines @@
       'browser/media/capture/animated_content_sampler_unittest.cc',
       'browser/media/capture/audio_mirroring_manager_unittest.cc',
       'browser/media/capture/feedback_signal_accumulator_unittest.cc',
       'browser/media/capture/smooth_event_sampler_unittest.cc',
       'browser/media/capture/video_capture_oracle_unittest.cc',
       'browser/media/capture/web_contents_audio_input_stream_unittest.cc',
       'browser/media/capture/web_contents_video_capture_device_unittest.cc',
       'browser/media/media_internals_unittest.cc',
       'browser/media/midi_host_unittest.cc',
       'browser/media/webrtc_identity_store_unittest.cc',
-      'browser/net/sqlite_persistent_cookie_store_unittest.cc',
+      'browser/net/quota_policy_cookie_store_unittest.cc',
       'browser/notification_service_impl_unittest.cc',
       'browser/notifications/notification_database_data_unittest.cc',
       'browser/notifications/notification_database_unittest.cc',
       'browser/notifications/platform_notification_context_unittest.cc',
       'browser/power_monitor_message_broadcaster_unittest.cc',
       'browser/power_profiler/power_profiler_service_unittest.cc',
       'browser/power_usage_monitor_impl_unittest.cc',
       'browser/presentation/presentation_service_impl_unittest.cc',
       'browser/presentation/presentation_type_converters_unittest.cc',
       'browser/quota/mock_quota_manager.cc',
@@ skipping 478 matching lines @@
         'browser/speech/proto/speech_proto.gyp:speech_proto',
         'content.gyp:content_browser',
         'content.gyp:content_common',
         'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
         'test_support_content',
         '../base/base.gyp:test_support_base',
         '../crypto/crypto.gyp:crypto',
         '../device/battery/battery.gyp:device_battery',
         '../device/battery/battery.gyp:device_battery_mojo_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
+        '../net/net.gyp:net_extras',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sql/sql.gyp:test_support_sql',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../third_party/re2/re2.gyp:re2',
         '../ui/accessibility/accessibility.gyp:accessibility',
@@ skipping 254 matching lines @@
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../testing/perf/perf_test.gyp:*',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
-            'browser/net/sqlite_persistent_cookie_store_perftest.cc',
             'browser/renderer_host/input/input_router_impl_perftest.cc',
             'common/cc_messages_perftest.cc',
             'common/discardable_shared_memory_heap_perftest.cc',
             'test/run_all_perftests.cc',
           ],
           'conditions': [
             ['OS == "android"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
@@ skipping 885 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }