Reland "Re-enable the new SQLitePersistentCookieStore load strategy."

content/browser/net/sqlite_persistent_cookie_store.cc

 // 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.
 
 #include "content/browser/net/sqlite_persistent_cookie_store.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 32 matching lines @@
 #include "third_party/sqlite/sqlite3.h"
 #include "url/gurl.h"
 
 using base::Time;
 
 namespace {
 
 // The persistent cookie store is loaded into memory on eTLD at a time. This
 // variable controls the delay between loading eTLDs, so as to not overload the
 // CPU or I/O with these low priority requests immediately after start up.
-// TODO(erikchen): Investigate why setting this value to 200 causes hangs on
-// shut down.
-// http://crbug.com/448910
-const int kLoadDelayMilliseconds = 0;
+const int kLoadDelayMilliseconds = 200;
 
 }  // namespace
 
 namespace content {
 
 // This class is designed to be shared between any client thread and the
 // background task runner. It batches operations and commits them on a timer.
 //
 // SQLitePersistentCookieStore::Load is called to load all cookies.  It
 // delegates to Backend::Load, which posts a Backend::LoadAndNotifyOnDBThread
@@ skipping 1321 matching lines @@
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableFileCookies)) {
     cookie_monster->SetEnableFileScheme(true);
   }
 
   return cookie_monster;
 }
 
 }  // namespace content