Don't force non-session only cookies to be session only cookies, instead delete on shutdown

chrome/chrome_tests.gypi

 # Copyright (c) 2012 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 4172 matching lines @@
             '../content/content.gyp:content_gpu',
             '../content/content.gyp:test_support_content',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../base/base.gyp:test_support_perf',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../webkit/support/webkit_support.gyp:glue',
           ],
           'sources': [
+            'browser/net/sqlite_persistent_cookie_store_perftest.cc',
             'browser/visitedlink/visitedlink_perftest.cc',
             'common/json_value_serializer_perftest.cc',
             'test/perf/perftests.cc',
             'test/perf/url_parse_perftest.cc',
           ],
           'conditions': [
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
@@ skipping 394 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }