Revert of Move sqlite_channel_id_store from chrome/browser/net to net/extras.

chrome/chrome_browser.gypi

 # Copyright 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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 811 matching lines @@
       'browser/net/predictor.cc',
       'browser/net/predictor.h',
       'browser/net/pref_proxy_config_tracker.cc',
       'browser/net/pref_proxy_config_tracker.h',
       'browser/net/pref_proxy_config_tracker_impl.cc',
       'browser/net/pref_proxy_config_tracker_impl.h',
       'browser/net/probe_message.cc',
       'browser/net/probe_message.h',
       'browser/net/proxy_service_factory.cc',
       'browser/net/proxy_service_factory.h',
-      'browser/net/quota_policy_channel_id_store.cc',
-      'browser/net/quota_policy_channel_id_store.h',
       'browser/net/referrer.cc',
       'browser/net/referrer.h',
       'browser/net/safe_search_util.cc',
       'browser/net/safe_search_util.h',
       'browser/net/service_providers_win.cc',
       'browser/net/service_providers_win.h',
       'browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc',
       'browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h',
       'browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc',
       'browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h',
       'browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc',
       'browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h',
       'browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.cc',
       'browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.h',
       'browser/net/spdyproxy/data_reduction_proxy_settings_android.cc',
       'browser/net/spdyproxy/data_reduction_proxy_settings_android.h',
+      'browser/net/sqlite_channel_id_store.cc',
+      'browser/net/sqlite_channel_id_store.h',
       'browser/net/ssl_config_service_manager.h',
       'browser/net/ssl_config_service_manager_pref.cc',
       'browser/net/timed_cache.cc',
       'browser/net/timed_cache.h',
       'browser/net/url_info.cc',
       'browser/net/url_info.h',
       'browser/omaha_query_params/chrome_omaha_query_params_delegate.cc',
       'browser/omaha_query_params/chrome_omaha_query_params_delegate.h',
       'browser/omnibox/omnibox_log.cc',
       'browser/omnibox/omnibox_log.h',
@@ skipping 2102 matching lines @@
             '../components/components.gyp:visitedlink_browser',
             '../components/components.gyp:visitedlink_common',
             '../components/components.gyp:web_modal',
             '../media/cast/cast.gyp:cast_net',
             '../media/media.gyp:media',
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_cpp_bindings',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
             '../mojo/mojo_base.gyp:mojo_js_bindings',
             '../mojo/mojo_base.gyp:mojo_system_impl',
-            '../net/net.gyp:net_extras',
             '../net/net.gyp:net_with_v8',
             # TODO(tonyg): Remove this dependency (crbug.com/280157).
             '../testing/perf/perf_test.gyp:*',
             '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
             '../third_party/expat/expat.gyp:expat',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
             '../third_party/libyuv/libyuv.gyp:libyuv',
             '../third_party/npapi/npapi.gyp:npapi',
             '../third_party/smhasher/smhasher.gyp:cityhash',
@@ skipping 633 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }