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

mojo/services/network/network_context.cc

Index: mojo/services/network/network_context.cc
diff --git a/mojo/services/network/network_context.cc b/mojo/services/network/network_context.cc
index b3ff3aa02d7e26acfcb2adb952877815aa9229be..32248eafa475062706c7f4119f4202e647465fae 100644
--- a/mojo/services/network/network_context.cc
+++ b/mojo/services/network/network_context.cc
@@ -13,12 +13,9 @@
 #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"
 
@@ -27,7 +24,7 @@
 namespace {
 // Logs network information to the specified file.
 const char kLogNetLog[] = "log-net-log";
-}  // namespace
+}
 
 class NetworkContext::MojoNetLog : public net::NetLog {
  public:
@@ -75,10 +72,8 @@
   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() {
@@ -112,8 +107,7 @@
 
 // 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());
@@ -136,22 +130,6 @@
   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());
 }