Abstract pref storage from net::SdchOwner

ios/crnet/crnet_environment.mm

 // 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 "ios/crnet/crnet_environment.h"
 
 #import <Foundation/Foundation.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/i18n/icu_util.h"
 #include "base/json/json_writer.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_block.h"
 #include "base/macros.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_filter.h"
 #include "base/threading/worker_pool.h"
 #import "components/webp_transcode/webp_network_client_factory.h"
 #include "crypto/nss_util.h"
+#include "ios/crnet/sdch_owner_pref_storage.h"
 #include "ios/net/cookies/cookie_store_ios.h"
 #include "ios/net/crn_http_protocol_handler.h"
 #include "ios/net/empty_nsurlcache.h"
 #include "ios/net/http_cache_helper.h"
 #include "ios/net/request_tracker.h"
 #include "ios/web/public/user_agent.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/sdch_manager.h"
 #include "net/cert/cert_verifier.h"
@@ skipping 292 matching lines @@
   DCHECK(base::MessageLoop::current() == network_io_thread_->message_loop());
   net::URLRequestContext* context =
       main_context_getter_->GetURLRequestContext();
 
   if (!sdch_enabled_) {
     DCHECK_EQ(static_cast<net::SdchManager*>(nullptr), context->sdch_manager());
     return;
   }
 
   sdch_manager_.reset(new net::SdchManager());
-  sdch_owner_.reset(new net::SdchOwner(sdch_manager_.get(), context));
+  sdch_owner_.reset(
+      new net::SdchOwner(scoped_ptr<net::SdchOwner::PrefStorage>(
+                             new SdchOwnerPrefStorage(sdch_manager_.get())),
+                         context));
   if (!sdch_pref_store_filename_.empty()) {
     base::FilePath path(sdch_pref_store_filename_);
     pref_store_worker_pool_ = file_user_blocking_thread_->task_runner();
     net_pref_store_ = new JsonPrefStore(
         path,
         pref_store_worker_pool_.get(),
         scoped_ptr<PrefFilter>());
     net_pref_store_->ReadPrefsAsync(nullptr);
     sdch_owner_->EnablePersistentStorage(net_pref_store_.get());
   }
@@ skipping 137 matching lines @@
 
   return user_agent_settings->GetUserAgent();
 }
 
 void CrNetEnvironment::ClearCache(ClearCacheCallback callback) {
   PostToNetworkThread(
       FROM_HERE,
       base::Bind(&net::ClearHttpCache, main_context_getter_,
                  network_io_thread_->task_runner(), base::BindBlock(callback)));
 }