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

Revert of Move sqlite_channel_id_store from chrome/browser/net to net/extras. (patchset #26 of https://codereview.chromium.org/381073002/)

Reason for revert:
Closed the tree on failing net_unittests:

http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Tests%20%28dbg%29%281%29&number=32912

Original issue's description:
> Move sqlite_channel_id_store from chrome/browser/net to net/extras.
> Application of special storage policy is split out into chrome/browser/net/quota_policy_channel_id_store. 
> 
> TEST=net_unittests --gtest_filter=SQLiteChannelIDStoreTest*
> TEST=unit_tests --gtest_filter=QuotaPolicyChannelIDStore*
> 
> BUG=397545
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289996

TBR=mef@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/477253002

Cr-Commit-Position: refs/heads/master@{#290038}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290038 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/net/quota_policy_channel_id_store.cc

-// Copyright 2014 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.
-
-#include "chrome/browser/net/quota_policy_channel_id_store.h"
-
-#include <list>
-
-#include "base/basictypes.h"
-#include "base/bind.h"
-#include "base/file_util.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "base/metrics/histogram.h"
-#include "base/strings/string_util.h"
-#include "base/threading/thread.h"
-#include "base/threading/thread_restrictions.h"
-#include "net/cookies/cookie_util.h"
-#include "net/extras/sqlite/sqlite_channel_id_store.h"
-#include "url/gurl.h"
-#include "webkit/browser/quota/special_storage_policy.h"
-
-QuotaPolicyChannelIDStore::QuotaPolicyChannelIDStore(
-    const base::FilePath& path,
-    const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
-    quota::SpecialStoragePolicy* special_storage_policy)
-    : special_storage_policy_(special_storage_policy),
-      persistent_store_(
-          new net::SQLiteChannelIDStore(path, background_task_runner)) {
-  DCHECK(background_task_runner);
-}
-
-QuotaPolicyChannelIDStore::~QuotaPolicyChannelIDStore() {
-  if (!special_storage_policy_.get() ||
-      !special_storage_policy_->HasSessionOnlyOrigins()) {
-    return;
-  }
-  std::list<std::string> session_only_server_identifiers;
-  for (std::set<std::string>::iterator it = server_identifiers_.begin();
-       it != server_identifiers_.end();
-       ++it) {
-    GURL url(net::cookie_util::CookieOriginToURL(*it, true));
-    if (special_storage_policy_->IsStorageSessionOnly(url))
-      session_only_server_identifiers.push_back(*it);
-  }
-  persistent_store_->DeleteAllInList(session_only_server_identifiers);
-}
-
-void QuotaPolicyChannelIDStore::Load(const LoadedCallback& loaded_callback) {
-  persistent_store_->Load(
-      base::Bind(&QuotaPolicyChannelIDStore::OnLoad, this, loaded_callback));
-}
-
-void QuotaPolicyChannelIDStore::AddChannelID(
-    const net::DefaultChannelIDStore::ChannelID& channel_id) {
-  server_identifiers_.insert(channel_id.server_identifier());
-  persistent_store_->AddChannelID(channel_id);
-}
-
-void QuotaPolicyChannelIDStore::DeleteChannelID(
-    const net::DefaultChannelIDStore::ChannelID& channel_id) {
-  server_identifiers_.erase(channel_id.server_identifier());
-  persistent_store_->DeleteChannelID(channel_id);
-}
-
-void QuotaPolicyChannelIDStore::SetForceKeepSessionState() {
-  special_storage_policy_ = NULL;
-}
-
-void QuotaPolicyChannelIDStore::OnLoad(
-    const LoadedCallback& loaded_callback,
-    scoped_ptr<ChannelIDVector> channel_ids) {
-  for (ChannelIDVector::const_iterator channel_id = channel_ids->begin();
-       channel_id != channel_ids->end();
-       ++channel_id) {
-    server_identifiers_.insert((*channel_id)->server_identifier());
-  }
-  loaded_callback.Run(channel_ids.Pass());
-}

chrome/browser/net/quota_policy_channel_id_store.h

-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_NET_QUOTA_POLICY_CHANNEL_ID_STORE_H_
-#define CHROME_BROWSER_NET_QUOTA_POLICY_CHANNEL_ID_STORE_H_
-
-#include <set>
-#include <string>
-
-#include "base/callback_forward.h"
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
-#include "net/extras/sqlite/sqlite_channel_id_store.h"
-#include "net/ssl/default_channel_id_store.h"
-
-namespace base {
-class FilePath;
-class SequencedTaskRunner;
-}
-
-namespace quota {
-class SpecialStoragePolicy;
-}
-
-// Persistent ChannelID Store that takes into account SpecialStoragePolicy and
-// removes ChannelIDs that are StorageSessionOnly when store is closed.
-class QuotaPolicyChannelIDStore
-    : public net::DefaultChannelIDStore::PersistentStore {
- public:
-  // Create or open persistent store in file |path|. All I/O tasks are performed
-  // in background using |background_task_runner|. If provided, a
-  // |special_storage_policy| is consulted when the store is closed to decide
-  // which certificates to keep.
-  QuotaPolicyChannelIDStore(
-      const base::FilePath& path,
-      const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
-      quota::SpecialStoragePolicy* special_storage_policy);
-
-  // net::DefaultChannelIDStore::PersistentStore:
-  virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE;
-  virtual void AddChannelID(
-      const net::DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
-  virtual void DeleteChannelID(
-      const net::DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
-  virtual void SetForceKeepSessionState() OVERRIDE;
-
- private:
-  typedef ScopedVector<net::DefaultChannelIDStore::ChannelID> ChannelIDVector;
-
-  virtual ~QuotaPolicyChannelIDStore();
-
-  void OnLoad(const LoadedCallback& loaded_callback,
-              scoped_ptr<ChannelIDVector> channel_ids);
-
-  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
-  scoped_refptr<net::SQLiteChannelIDStore> persistent_store_;
-  // Cache of server identifiers we have channel IDs stored for.
-  std::set<std::string> server_identifiers_;
-
-  DISALLOW_COPY_AND_ASSIGN(QuotaPolicyChannelIDStore);
-};
-
-#endif  // CHROME_BROWSER_NET_QUOTA_POLICY_CHANNEL_ID_STORE_H_

chrome/browser/net/quota_policy_channel_id_store_unittest.cc

-// Copyright 2014 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.
-
-#include "base/bind.h"
-#include "base/file_util.h"
-#include "base/files/scoped_temp_dir.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
-#include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
-#include "base/stl_util.h"
-#include "base/thread_task_runner_handle.h"
-#include "base/time/time.h"
-#include "chrome/browser/net/quota_policy_channel_id_store.h"
-#include "content/public/test/mock_special_storage_policy.h"
-#include "content/public/test/test_browser_thread_bundle.h"
-#include "net/base/test_data_directory.h"
-#include "net/cookies/cookie_util.h"
-#include "net/ssl/ssl_client_cert_type.h"
-#include "net/test/cert_test_util.h"
-#include "sql/statement.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-const base::FilePath::CharType kTestChannelIDFilename[] =
-    FILE_PATH_LITERAL("ChannelID");
-
-class QuotaPolicyChannelIDStoreTest : public testing::Test {
- public:
-  void Load(ScopedVector<net::DefaultChannelIDStore::ChannelID>* channel_ids) {
-    base::RunLoop run_loop;
-    store_->Load(base::Bind(&QuotaPolicyChannelIDStoreTest::OnLoaded,
-                            base::Unretained(this),
-                            &run_loop));
-    run_loop.Run();
-    channel_ids->swap(channel_ids_);
-    channel_ids_.clear();
-  }
-
-  void OnLoaded(base::RunLoop* run_loop,
-                scoped_ptr<ScopedVector<net::DefaultChannelIDStore::ChannelID> >
-                    channel_ids) {
-    channel_ids_.swap(*channel_ids);
-    run_loop->Quit();
-  }
-
- protected:
-  static base::Time GetTestCertExpirationTime() {
-    // Cert expiration time from 'dumpasn1 unittest.originbound.der':
-    // GeneralizedTime 19/11/2111 02:23:45 GMT
-    // base::Time::FromUTCExploded can't generate values past 2038 on 32-bit
-    // linux, so we use the raw value here.
-    return base::Time::FromInternalValue(GG_INT64_C(16121816625000000));
-  }
-
-  static base::Time GetTestCertCreationTime() {
-    // UTCTime 13/12/2011 02:23:45 GMT
-    base::Time::Exploded exploded_time;
-    exploded_time.year = 2011;
-    exploded_time.month = 12;
-    exploded_time.day_of_week = 0;  // Unused.
-    exploded_time.day_of_month = 13;
-    exploded_time.hour = 2;
-    exploded_time.minute = 23;
-    exploded_time.second = 45;
-    exploded_time.millisecond = 0;
-    return base::Time::FromUTCExploded(exploded_time);
-  }
-
-  virtual void SetUp() {
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    store_ = new QuotaPolicyChannelIDStore(
-        temp_dir_.path().Append(kTestChannelIDFilename),
-        base::ThreadTaskRunnerHandle::Get(),
-        NULL);
-    ScopedVector<net::DefaultChannelIDStore::ChannelID> channel_ids;
-    Load(&channel_ids);
-    ASSERT_EQ(0u, channel_ids.size());
-    // Make sure the store gets written at least once.
-    store_->AddChannelID(
-        net::DefaultChannelIDStore::ChannelID("google.com",
-                                              base::Time::FromInternalValue(1),
-                                              base::Time::FromInternalValue(2),
-                                              "a",
-                                              "b"));
-  }
-
-  virtual void TearDown() {
-    store_ = NULL;
-    loop_.RunUntilIdle();
-  }
-
-  base::ScopedTempDir temp_dir_;
-  scoped_refptr<QuotaPolicyChannelIDStore> store_;
-  ScopedVector<net::DefaultChannelIDStore::ChannelID> channel_ids_;
-  base::MessageLoop loop_;
-};
-
-// Test if data is stored as expected in the QuotaPolicy database.
-TEST_F(QuotaPolicyChannelIDStoreTest, TestPersistence) {
-  store_->AddChannelID(
-      net::DefaultChannelIDStore::ChannelID("foo.com",
-                                            base::Time::FromInternalValue(3),
-                                            base::Time::FromInternalValue(4),
-                                            "c",
-                                            "d"));
-
-  ScopedVector<net::DefaultChannelIDStore::ChannelID> channel_ids;
-  // Replace the store effectively destroying the current one and forcing it
-  // to write its data to disk. Then we can see if after loading it again it
-  // is still there.
-  store_ = NULL;
-  // Make sure we wait until the destructor has run.
-  base::RunLoop().RunUntilIdle();
-  store_ = new QuotaPolicyChannelIDStore(
-      temp_dir_.path().Append(kTestChannelIDFilename),
-      base::MessageLoopProxy::current(),
-      NULL);
-
-  // Reload and test for persistence
-  Load(&channel_ids);
-  ASSERT_EQ(2U, channel_ids.size());
-  net::DefaultChannelIDStore::ChannelID* goog_channel_id;
-  net::DefaultChannelIDStore::ChannelID* foo_channel_id;
-  if (channel_ids[0]->server_identifier() == "google.com") {
-    goog_channel_id = channel_ids[0];
-    foo_channel_id = channel_ids[1];
-  } else {
-    goog_channel_id = channel_ids[1];
-    foo_channel_id = channel_ids[0];
-  }
-  ASSERT_EQ("google.com", goog_channel_id->server_identifier());
-  ASSERT_STREQ("a", goog_channel_id->private_key().c_str());
-  ASSERT_STREQ("b", goog_channel_id->cert().c_str());
-  ASSERT_EQ(1, goog_channel_id->creation_time().ToInternalValue());
-  ASSERT_EQ(2, goog_channel_id->expiration_time().ToInternalValue());
-  ASSERT_EQ("foo.com", foo_channel_id->server_identifier());
-  ASSERT_STREQ("c", foo_channel_id->private_key().c_str());
-  ASSERT_STREQ("d", foo_channel_id->cert().c_str());
-  ASSERT_EQ(3, foo_channel_id->creation_time().ToInternalValue());
-  ASSERT_EQ(4, foo_channel_id->expiration_time().ToInternalValue());
-
-  // Now delete the cert and check persistence again.
-  store_->DeleteChannelID(*channel_ids[0]);
-  store_->DeleteChannelID(*channel_ids[1]);
-  store_ = NULL;
-  // Make sure we wait until the destructor has run.
-  base::RunLoop().RunUntilIdle();
-  channel_ids.clear();
-  store_ = new QuotaPolicyChannelIDStore(
-      temp_dir_.path().Append(kTestChannelIDFilename),
-      base::MessageLoopProxy::current(),
-      NULL);
-
-  // Reload and check if the cert has been removed.
-  Load(&channel_ids);
-  ASSERT_EQ(0U, channel_ids.size());
-}
-
-// Test if data is stored as expected in the QuotaPolicy database.
-TEST_F(QuotaPolicyChannelIDStoreTest, TestPolicy) {
-  store_->AddChannelID(
-      net::DefaultChannelIDStore::ChannelID("foo.com",
-                                            base::Time::FromInternalValue(3),
-                                            base::Time::FromInternalValue(4),
-                                            "c",
-                                            "d"));
-
-  ScopedVector<net::DefaultChannelIDStore::ChannelID> channel_ids;
-  // Replace the store effectively destroying the current one and forcing it
-  // to write its data to disk. Then we can see if after loading it again it
-  // is still there.
-  store_ = NULL;
-  // Make sure we wait until the destructor has run.
-  base::RunLoop().RunUntilIdle();
-  // Specify storage policy that makes "foo.com" session only.
-  scoped_refptr<content::MockSpecialStoragePolicy> storage_policy =
-      new content::MockSpecialStoragePolicy();
-  storage_policy->AddSessionOnly(
-      net::cookie_util::CookieOriginToURL("foo.com", true));
-  // Reload store, it should still have both channel ids.
-  store_ = new QuotaPolicyChannelIDStore(
-      temp_dir_.path().Append(kTestChannelIDFilename),
-      base::MessageLoopProxy::current(),
-      storage_policy);
-  Load(&channel_ids);
-  ASSERT_EQ(2U, channel_ids.size());
-
-  // Now close the store, and "foo.com" should be deleted according to policy.
-  store_ = NULL;
-  // Make sure we wait until the destructor has run.
-  base::RunLoop().RunUntilIdle();
-  channel_ids.clear();
-  store_ = new QuotaPolicyChannelIDStore(
-      temp_dir_.path().Append(kTestChannelIDFilename),
-      base::MessageLoopProxy::current(),
-      NULL);
-
-  // Reload and check that the "foo.com" cert has been removed.
-  Load(&channel_ids);
-  ASSERT_EQ(1U, channel_ids.size());
-  ASSERT_EQ("google.com", channel_ids[0]->server_identifier());
-}

net/extras/sqlite/sqlite_channel_id_store.h → chrome/browser/net/sqlite_channel_id_store.h

@@ -2,15 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_EXTRAS_SQLITE_SQLITE_CHANNEL_ID_STORE_H_
-#define NET_EXTRAS_SQLITE_SQLITE_CHANNEL_ID_STORE_H_
-
-#include <list>
-#include <string>
+#ifndef CHROME_BROWSER_NET_SQLITE_CHANNEL_ID_STORE_H_
+#define CHROME_BROWSER_NET_SQLITE_CHANNEL_ID_STORE_H_
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "net/ssl/default_channel_id_store.h"
 
@@ -19,36 +15,36 @@ class FilePath;
 class SequencedTaskRunner;
 }
 
-class GURL;
-
-namespace net {
+namespace quota {
+class SpecialStoragePolicy;
+}
 
-// Implements the DefaultChannelIDStore::PersistentStore interface
+// Implements the net::DefaultChannelIDStore::PersistentStore interface
 // in terms of a SQLite database. For documentation about the actual member
 // functions consult the documentation of the parent class
-// DefaultChannelIDStore::PersistentCertStore.
-class SQLiteChannelIDStore : public DefaultChannelIDStore::PersistentStore {
+// |net::DefaultChannelIDStore::PersistentCertStore|.
+// If provided, a |SpecialStoragePolicy| is consulted when the SQLite database
+// is closed to decide which certificates to keep.
+class SQLiteChannelIDStore
+    : public net::DefaultChannelIDStore::PersistentStore {
  public:
-  // Create or open persistent store in file |path|. All I/O tasks are performed
-  // in background using |background_task_runner|.
   SQLiteChannelIDStore(
       const base::FilePath& path,
-      const scoped_refptr<base::SequencedTaskRunner>& background_task_runner);
+      const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
+      quota::SpecialStoragePolicy* special_storage_policy);
 
-  // DefaultChannelIDStore::PersistentStore:
+  // net::DefaultChannelIDStore::PersistentStore:
   virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE;
   virtual void AddChannelID(
-      const DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
+      const net::DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
   virtual void DeleteChannelID(
-      const DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
+      const net::DefaultChannelIDStore::ChannelID& channel_idx) OVERRIDE;
   virtual void SetForceKeepSessionState() OVERRIDE;
 
-  // Delete channel ids from servers in |server_identifiers|.
-  void DeleteAllInList(const std::list<std::string>& server_identifiers);
-
- private:
+ protected:
   virtual ~SQLiteChannelIDStore();
 
+ private:
   class Backend;
 
   scoped_refptr<Backend> backend_;
@@ -56,6 +52,4 @@ class SQLiteChannelIDStore : public DefaultChannelIDStore::PersistentStore {
   DISALLOW_COPY_AND_ASSIGN(SQLiteChannelIDStore);
 };
 
-}  // namespace net
-
-#endif  // NET_EXTRAS_SQLITE_SQLITE_CHANNEL_ID_STORE_H_
+#endif  // CHROME_BROWSER_NET_SQLITE_CHANNEL_ID_STORE_H_

chrome/browser/profiles/profile_impl_io_data.cc

@@ -26,8 +26,8 @@
 #include "chrome/browser/net/cookie_store_util.h"
 #include "chrome/browser/net/http_server_properties_manager_factory.h"
 #include "chrome/browser/net/predictor.h"
-#include "chrome/browser/net/quota_policy_channel_id_store.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
+#include "chrome/browser/net/sqlite_channel_id_store.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ -515,8 +515,8 @@ void ProfileImplIOData::InitializeInternal(
   if (!channel_id_service) {
     DCHECK(!lazy_params_->channel_id_path.empty());
 
-    scoped_refptr<QuotaPolicyChannelIDStore> channel_id_db =
-        new QuotaPolicyChannelIDStore(
+    scoped_refptr<SQLiteChannelIDStore> channel_id_db =
+        new SQLiteChannelIDStore(
             lazy_params_->channel_id_path,
             BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
                 BrowserThread::GetBlockingPool()->GetSequenceToken()),

chrome/chrome_browser.gypi

@@ -827,8 +827,6 @@
       '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',
@@ -845,6 +843,8 @@
       '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',
@@ -2983,7 +2983,6 @@
             '../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:*',

chrome/chrome_tests_unit.gypi

@@ -1108,10 +1108,10 @@
         'browser/net/pref_proxy_config_tracker_impl_unittest.cc',
         'browser/net/probe_message_unittest.cc',
         'browser/net/proxy_policy_handler_unittest.cc',
-        'browser/net/quota_policy_channel_id_store_unittest.cc',
         'browser/net/safe_search_util_unittest.cc',
         'browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc',
         'browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc',
+        'browser/net/sqlite_channel_id_store_unittest.cc',
         'browser/net/ssl_config_service_manager_pref_unittest.cc',
         'browser/net/url_info_unittest.cc',
         'browser/notifications/desktop_notification_profile_util_unittest.cc',

content/content_browser.gypi

@@ -1133,9 +1133,9 @@
       'browser/service_worker/service_worker_cache_listener.cc',
       'browser/service_worker/service_worker_cache_listener.h',
       'browser/service_worker/service_worker_cache_storage.cc',
-      'browser/service_worker/service_worker_cache_storage.h',
+      'browser/service_worker/service_worker_cache_storage.h',      
       'browser/service_worker/service_worker_cache_storage_manager.cc',
-      'browser/service_worker/service_worker_cache_storage_manager.h',
+      'browser/service_worker/service_worker_cache_storage_manager.h',      
       'browser/service_worker/service_worker_context_core.cc',
       'browser/service_worker/service_worker_context_core.h',
       'browser/service_worker/service_worker_context_observer.h',

net/BUILD.gn

@@ -563,15 +563,6 @@ grit("net_resources") {
   ]
 }
 
-static_library("net_extras") {
-  sources = gypi_values.net_extras_sources
-  configs += [ "//build/config/compiler:wexit_time_destructors" ]
-  deps = [
-    ":net",
-    "//sql:sql",
-  ]
-}
-
 static_library("http_server") {
   sources = [
     "server/http_connection.cc",
@@ -1103,7 +1094,6 @@ test("net_unittests") {
   deps = [
     ":http_server",
     ":net",
-    ":net_extras",
     ":quic_tools",
     ":test_support",
     "//base",

net/extras/sqlite/DEPS

-include_rules = [
-  "+base",
-  "+net",
-  "+sql",
-]

net/net.gyp

@@ -549,7 +549,6 @@
         'http_server',
         'net',
         'net_derived_sources',
-        'net_extras',
         'net_test_support',
         'quic_tools',
       ],
@@ -1050,19 +1049,6 @@
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
-    {
-      'target_name': 'net_extras',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../sql/sql.gyp:sql',
-        'net',
-      ],
-      'sources': [
-        '<@(net_extras_sources)',
-      ],
-    },
     {
       'target_name': 'http_server',
       'type': 'static_library',

net/net.gypi

@@ -1244,10 +1244,6 @@
       'websockets/websocket_throttle.cc',
       'websockets/websocket_throttle.h',
     ],
-    'net_extras_sources': [
-      'extras/sqlite/sqlite_channel_id_store.cc',
-      'extras/sqlite/sqlite_channel_id_store.h',
-    ],
     'net_test_sources': [
       'android/keystore_unittest.cc',
       'android/network_change_notifier_android_unittest.cc',
@@ -1347,7 +1343,6 @@
       'dns/record_rdata_unittest.cc',
       'dns/serial_worker_unittest.cc',
       'dns/single_request_host_resolver_unittest.cc',
-      'extras/sqlite/sqlite_channel_id_store_unittest.cc',
       'filter/filter_unittest.cc',
       'filter/gzip_filter_unittest.cc',
       'filter/mock_filter_context.cc',