Index: net/base/sdch_manager.h |
diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h |
index 63a0e4ba52b031fc3432171f2fcc1d46b5e18c39..360e29701a2fe63069f626d00638dcca960791f9 100644 |
--- a/net/base/sdch_manager.h |
+++ b/net/base/sdch_manager.h |
@@ -49,6 +49,7 @@ class SdchFetcher { |
// from a server. The callee is responsible for getting that dictionary_text, |
// and then calling back to AddSdchDictionary() to the SdchManager instance. |
virtual void Schedule(const GURL& dictionary_url) = 0; |
+ |
private: |
DISALLOW_COPY_AND_ASSIGN(SdchFetcher); |
}; |
@@ -102,7 +103,7 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
DICTIONARY_SELECTED_FOR_SSL = 31, |
DICTIONARY_ALREADY_LOADED = 32, |
DICTIONARY_SELECTED_FROM_NON_HTTP = 33, |
- DICTIONARY_IS_TOO_LARGE= 34, |
+ DICTIONARY_IS_TOO_LARGE = 34, |
DICTIONARY_COUNT_EXCEEDED = 35, |
DICTIONARY_ALREADY_SCHEDULED_TO_DOWNLOAD = 36, |
DICTIONARY_ALREADY_TRIED_TO_DOWNLOAD = 37, |
@@ -110,7 +111,6 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
// Failsafe hack. |
ATTEMPT_TO_DECODE_NON_HTTP_DATA = 40, |
- |
// Content-Encoding problems detected, with no action taken. |
MULTIENCODING_FOR_NON_SDCH_REQUEST = 50, |
SDCH_CONTENT_ENCODE_FOR_NON_SDCH_REQUEST = 51, |
@@ -119,7 +119,7 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
DOMAIN_BLACKLIST_INCLUDES_TARGET = 61, |
// Problematic decode recovery methods. |
- META_REFRESH_RECOVERY = 70, // Dictionary not found. |
+ META_REFRESH_RECOVERY = 70, // Dictionary not found. |
// defunct = 71, // Almost the same as META_REFRESH_UNSUPPORTED. |
// defunct = 72, // Almost the same as CACHED_META_REFRESH_UNSUPPORTED. |
// defunct = 73, // PASSING_THROUGH_NON_SDCH plus DISCARD_TENTATIVE_SDCH. |
@@ -131,7 +131,7 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
// This next report is very common, and not really an error scenario, but |
// it exercises the error recovery logic. |
- PASS_THROUGH_OLD_CACHED = 79, // Back button got pre-SDCH cached content. |
+ PASS_THROUGH_OLD_CACHED = 79, // Back button got pre-SDCH cached content. |
// Common decoded recovery methods. |
META_REFRESH_CACHED_RECOVERY = 80, // Probably startup tab loading. |
@@ -140,10 +140,9 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
// Non SDCH problems, only accounted for to make stat counting complete |
// (i.e., be able to be sure all dictionary advertisements are accounted |
// for). |
- |
- UNFLUSHED_CONTENT = 90, // Possible error in filter chaining. |
+ UNFLUSHED_CONTENT = 90, // Possible error in filter chaining. |
// defunct = 91, // MISSING_TIME_STATS (Should never happen.) |
- CACHE_DECODED = 92, // No timing stats recorded. |
+ CACHE_DECODED = 92, // No timing stats recorded. |
// defunct = 93, // OVER_10_MINUTES (No timing stats recorded.) |
UNINITIALIZED = 94, // Filter never even got initialized. |
PRIOR_TO_DICTIONARY = 95, // We hadn't even parsed a dictionary selector. |
@@ -151,8 +150,7 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
// Problem during the latency test. |
LATENCY_TEST_DISALLOWED = 100, // SDCH now failing, but it worked before! |
- |
- MAX_PROBLEM_CODE // Used to bound histogram. |
+ MAX_PROBLEM_CODE // Used to bound histogram. |
}; |
// Use the following static limits to block DOS attacks until we implement |
@@ -194,8 +192,10 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
// Security methods to check if we can establish a new dictionary with the |
// given data, that arrived in response to get of dictionary_url. |
- static bool CanSet(const std::string& domain, const std::string& path, |
- const std::set<int>& ports, const GURL& dictionary_url); |
+ static bool CanSet(const std::string& domain, |
+ const std::string& path, |
+ const std::set<int>& ports, |
+ const GURL& dictionary_url); |
// Security method to check if we can use a dictionary to decompress a |
// target that arrived with a reference to this dictionary. |
@@ -208,7 +208,6 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
// Compare domains to see if the "match" for dictionary use. |
static bool DomainMatch(const GURL& url, const std::string& restriction); |
- |
// The actual text of the dictionary. |
std::string text_; |
@@ -326,7 +325,8 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) { |
// dictionary. This is only made public to facilitate unit testing, but is |
// otherwise private |
static void GenerateHash(const std::string& dictionary_text, |
- std::string* client_hash, std::string* server_hash); |
+ std::string* client_hash, |
+ std::string* server_hash); |
// For Latency testing only, we need to know if we've succeeded in doing a |
// round trip before starting our comparative tests. If ever we encounter |