Split SdchManager::Dictionary out into separate class/file.

net/filter/sdch_filter.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.
 
 // SdchFilter applies open_vcdiff content decoding to a datastream.
 // This decoding uses a pre-cached dictionary of text fragments to decode
 // (expand) the stream back to its original contents.
 //
 // This SdchFilter internally uses open_vcdiff/vcdec library to do decoding.
 //
 // SdchFilter is also a subclass of Filter. See the latter's header file
 // filter.h for sample usage.
 
 #ifndef NET_FILTER_SDCH_FILTER_H_
 #define NET_FILTER_SDCH_FILTER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
+#include "net/base/sdch_dictionary.h"
 #include "net/base/sdch_manager.h"
 #include "net/filter/filter.h"
 
 namespace open_vcdiff {
 class VCDiffStreamingDecoder;
 }
 
 namespace net {
 
 class NET_EXPORT_PRIVATE SdchFilter : public Filter {
@@ skipping 57 matching lines @@
   // sdch payload, we check to see if it is plausible, meaning it has a null
   // termination, and has 8 characters that are possible in a net-safe base64
   // encoding. If the hash is not plausible, then the payload is probably not
   // an SDCH encoded bundle, and various error recovery strategies can be
   // attempted.
   bool dictionary_hash_is_plausible_;
 
   // Validity of this pointer is guaranteed by either the FilterContext holding
   // a containing SdchManager::DictionarySet, or this object holding a
   // container in |unexpected_dictionary_handle_| below.
-  const SdchManager::Dictionary *dictionary_;
+  const SdchDictionary* dictionary_;
 
   // We keep a copy of the URLRequestContext for use in the destructor, (at
   // which point GetURLRequestContext() will likely return null because of
   // the disassociation of the URLRequest from the URLRequestJob). This is
   // safe because the URLRequestJob (and any filters) are guaranteed to be
   // deleted before the URLRequestContext is destroyed.
   const URLRequestContext* const url_request_context_;
 
   // The decoder may demand a larger output buffer than the target of
   // ReadFilteredData so we buffer the excess output between calls.
@@ skipping 24 matching lines @@
   // advertised (e.g. a cached response using an old dictionary), this
   // variable preserves that dictionary from deletion during decoding.
   scoped_ptr<SdchManager::DictionarySet> unexpected_dictionary_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(SdchFilter);
 };
 
 }  // namespace net
 
 #endif  // NET_FILTER_SDCH_FILTER_H_