Revert of mandoline filesystem: Save cookie data to the mojo:filesystem.

mojo/services/network/network_context.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 "mojo/services/network/network_context.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "mojo/common/user_agent.h"
 #include "mojo/services/network/url_loader_impl.h"
-#include "net/cookies/cookie_monster.h"
-#include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
 #include "net/log/net_log_util.h"
 #include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
-#include "net/ssl/channel_id_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 
 namespace mojo {
 
 namespace {
 // Logs network information to the specified file.
 const char kLogNetLog[] = "log-net-log";
-}  // namespace
+}
 
 class NetworkContext::MojoNetLog : public net::NetLog {
  public:
   MojoNetLog() {
     const base::CommandLine* command_line =
         base::CommandLine::ForCurrentProcess();
     if (!command_line->HasSwitch(kLogNetLog))
       return;
 
     base::FilePath log_path = command_line->GetSwitchValuePath(kLogNetLog);
@@ skipping 27 matching lines @@
 };
 
 NetworkContext::NetworkContext(
     scoped_ptr<net::URLRequestContext> url_request_context)
     : net_log_(new MojoNetLog),
       url_request_context_(url_request_context.Pass()),
       in_shutdown_(false) {
   url_request_context_->set_net_log(net_log_.get());
 }
 
-NetworkContext::NetworkContext(
-    const base::FilePath& base_path,
-    const scoped_refptr<base::SequencedTaskRunner>& background_task_runner)
-    : NetworkContext(MakeURLRequestContext(base_path, background_task_runner)) {
+NetworkContext::NetworkContext(const base::FilePath& base_path)
+    : NetworkContext(MakeURLRequestContext(base_path)) {
 }
 
 NetworkContext::~NetworkContext() {
   in_shutdown_ = true;
   // TODO(darin): Be careful about destruction order of member variables?
 
   // Call each URLLoaderImpl and ask it to release its net::URLRequest, as the
   // corresponding net::URLRequestContext is going away with this
   // NetworkContext. The loaders can be deregistering themselves in Cleanup(),
   // so iterate over a copy.
@@ skipping 13 matching lines @@
     DCHECK(removed_count);
   }
 }
 
 size_t NetworkContext::GetURLLoaderCountForTesting() {
   return url_loaders_.size();
 }
 
 // static
 scoped_ptr<net::URLRequestContext> NetworkContext::MakeURLRequestContext(
-    const base::FilePath& base_path,
-    const scoped_refptr<base::SequencedTaskRunner>& background_task_runner) {
+    const base::FilePath& base_path) {
   net::URLRequestContextBuilder builder;
   builder.set_accept_language("en-us,en");
   builder.set_user_agent(mojo::common::GetUserAgent());
   builder.set_proxy_service(net::ProxyService::CreateDirect());
   builder.set_transport_security_persister_path(base_path);
 
   net::URLRequestContextBuilder::HttpCacheParams cache_params;
 #if defined(OS_ANDROID)
   // On Android, we store the cache on disk becase we can run only a single
   // instance of the shell at a time.
   cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK;
   cache_params.path = base_path.Append(FILE_PATH_LITERAL("Cache"));
 #else
   // On desktop, we store the cache in memory so we can run many shells
   // in parallel when running tests, otherwise the network services in each
   // shell will corrupt the disk cache.
   cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::IN_MEMORY;
 #endif
 
   builder.EnableHttpCache(cache_params);
   builder.set_file_enabled(true);
 
-  if (background_task_runner) {
-    // TODO(erg): This only gets run on non-android system. Currently, any
-    // attempts from the network_service trying to access the filesystem break
-    // the apptests on android. (And only the apptests on android. Mandoline
-    // shell works fine on android, as does apptests on desktop.)
-    net::SQLitePersistentCookieStore* sqlite_store =
-        new net::SQLitePersistentCookieStore(
-            base::FilePath(FILE_PATH_LITERAL("Cookies")),
-            base::MessageLoop::current()->task_runner(),
-            background_task_runner,
-            false,  // TODO(erg): Make RESTORED_SESSION_COOKIES configurable.
-            nullptr);
-    builder.SetCookieAndChannelIdStores(
-        new net::CookieMonster(sqlite_store, nullptr) , nullptr);
-  }
-
   return make_scoped_ptr(builder.Build());
 }
 
 }  // namespace mojo