Renamed raw_data_length to encoded_data_length

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/6838021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81464 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 20 insertions, 19 deletions

diff --git a/chrome/browser/debugger/devtools_netlog_observer.cc b/chrome/browser/debugger/devtools_netlog_observer.cc
index 8789de2..f0fa8aa 100644
--- a/chrome/browser/debugger/devtools_netlog_observer.cc
+++ b/chrome/browser/debugger/devtools_netlog_observer.cc
@@ -83,20 +83,20 @@ void DevToolsNetLogObserver::OnAddURLRequestEntry(
 
       request_to_info_[source.id] = new ResourceInfo();
 
-      if (request_to_raw_data_length_.size() > kMaxNumEntries) {
-        LOG(WARNING) << "The raw data length observer url request count has "
-                        "grown larger than expected, resetting";
-        request_to_raw_data_length_.clear();
+      if (request_to_encoded_data_length_.size() > kMaxNumEntries) {
+        LOG(WARNING) << "The encoded data length observer url request count "
+                        "has grown larger than expected, resetting";
+        request_to_encoded_data_length_.clear();
       }
 
-      request_to_raw_data_length_[source.id] = 0;
+      request_to_encoded_data_length_[source.id] = 0;
     }
     return;
   } else if (type == net::NetLog::TYPE_REQUEST_ALIVE) {
     // Cleanup records based on the TYPE_REQUEST_ALIVE entry.
     if (is_end) {
       request_to_info_.erase(source.id);
-      request_to_raw_data_length_.erase(source.id);
+      request_to_encoded_data_length_.erase(source.id);
     }
     return;
   }
@@ -196,9 +196,9 @@ void DevToolsNetLogObserver::OnAddSocketEntry(
     return;
   }
 
-  RequestToRawDataLengthMap::iterator raw_data_length_it =
-      request_to_raw_data_length_.find(request_id);
-  if (raw_data_length_it == request_to_raw_data_length_.end())
+  RequestToEncodedDataLengthMap::iterator encoded_data_length_it =
+      request_to_encoded_data_length_.find(request_id);
+  if (encoded_data_length_it == request_to_encoded_data_length_.end())
     return;
 
   if (net::NetLog::TYPE_SOCKET_BYTES_RECEIVED == type) {
@@ -211,7 +211,7 @@ void DevToolsNetLogObserver::OnAddSocketEntry(
     if (!dValue->GetInteger("byte_count", &byte_count))
       return;
 
-    raw_data_length_it->second += byte_count;
+    encoded_data_length_it->second += byte_count;
   }
 }
 
@@ -252,7 +252,7 @@ void DevToolsNetLogObserver::PopulateResponseInfo(net::URLRequest* request,
 }
 
 // static
-int DevToolsNetLogObserver::GetAndResetRawDataLength(
+int DevToolsNetLogObserver::GetAndResetEncodedDataLength(
     net::URLRequest* request) {
   if (!(request->load_flags() & net::LOAD_REPORT_RAW_HEADERS))
     return -1;
@@ -263,11 +263,12 @@ int DevToolsNetLogObserver::GetAndResetRawDataLength(
   if (dev_tools_net_log_observer == NULL)
     return -1;
 
-  RequestToRawDataLengthMap::iterator it =
-      dev_tools_net_log_observer->request_to_raw_data_length_.find(source_id);
-  if (it == dev_tools_net_log_observer->request_to_raw_data_length_.end())
+  RequestToEncodedDataLengthMap::iterator it =
+      dev_tools_net_log_observer->request_to_encoded_data_length_.find(
+          source_id);
+  if (it == dev_tools_net_log_observer->request_to_encoded_data_length_.end())
     return -1;
-  int raw_data_length = it->second;
+  int encoded_data_length = it->second;
   it->second = 0;
-  return raw_data_length;
+  return encoded_data_length;
 }
diff --git a/chrome/browser/debugger/devtools_netlog_observer.h b/chrome/browser/debugger/devtools_netlog_observer.h
index 830afca..2d0abf3 100644
--- a/chrome/browser/debugger/devtools_netlog_observer.h
+++ b/chrome/browser/debugger/devtools_netlog_observer.h
@@ -61,7 +61,7 @@ class DevToolsNetLogObserver: public ChromeNetLog::ThreadSafeObserver {
   // are active.
   static DevToolsNetLogObserver* GetInstance();
   static void PopulateResponseInfo(net::URLRequest*, ResourceResponse*);
-  static int GetAndResetRawDataLength(net::URLRequest* request);
+  static int GetAndResetEncodedDataLength(net::URLRequest* request);
 
  private:
   static DevToolsNetLogObserver* instance_;
@@ -73,11 +73,11 @@ class DevToolsNetLogObserver: public ChromeNetLog::ThreadSafeObserver {
 
   ChromeNetLog* chrome_net_log_;
   typedef base::hash_map<uint32, scoped_refptr<ResourceInfo> > RequestToInfoMap;
-  typedef base::hash_map<uint32, int> RequestToRawDataLengthMap;
+  typedef base::hash_map<uint32, int> RequestToEncodedDataLengthMap;
   typedef base::hash_map<uint32, uint32> HTTPStreamJobToSocketMap;
   typedef base::hash_map<uint32, uint32> SocketToRequestMap;
   RequestToInfoMap request_to_info_;
-  RequestToRawDataLengthMap request_to_raw_data_length_;
+  RequestToEncodedDataLengthMap request_to_encoded_data_length_;
   HTTPStreamJobToSocketMap http_stream_job_to_socket_;
   SocketToRequestMap socket_to_request_;