Sdch view for net-internals

net/base/sdch_dictionary_fetcher.cc

 // 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 "net/base/sdch_dictionary_fetcher.h"
 
 #include <stdint.h>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 22 matching lines @@
       weak_factory_(this) {
   DCHECK(CalledOnValidThread());
   DCHECK(consumer);
   DCHECK(context);
 }
 
 SdchDictionaryFetcher::~SdchDictionaryFetcher() {
   DCHECK(CalledOnValidThread());
 }
 
-void SdchDictionaryFetcher::Schedule(const GURL& dictionary_url) {
+SdchFetcher::ScheduleResult SdchDictionaryFetcher::Schedule(
+    const GURL& dictionary_url) {
   DCHECK(CalledOnValidThread());
 
   // Avoid pushing duplicate copy onto queue. We may fetch this url again later
   // and get a different dictionary, but there is no reason to have it in the
   // queue twice at one time.
-  if (!fetch_queue_.empty() && fetch_queue_.back() == dictionary_url) {
-    SdchManager::SdchErrorRecovery(
-        SdchManager::DICTIONARY_ALREADY_SCHEDULED_TO_DOWNLOAD);
-    return;
-  }
-  if (attempted_load_.find(dictionary_url) != attempted_load_.end()) {
-    SdchManager::SdchErrorRecovery(
-        SdchManager::DICTIONARY_ALREADY_TRIED_TO_DOWNLOAD);
-    return;
-  }
+  if (!fetch_queue_.empty() && fetch_queue_.back() == dictionary_url)
+    return ALREADY_SCHEDULED;
+
+  if (attempted_load_.find(dictionary_url) != attempted_load_.end())
+    return ALREADY_TRIED;
+
   attempted_load_.insert(dictionary_url);
   fetch_queue_.push(dictionary_url);
 
   next_state_ = STATE_IDLE;
 
   // There are no callbacks to user code from the dictionary fetcher,
   // and Schedule() is only called from user code, so this call to DoLoop()
   // does not require an |if (in_loop_) return;| guard.
   DoLoop(OK);
+
+  return SCHEDULE_OK;
 }
 
 void SdchDictionaryFetcher::Cancel() {
   DCHECK(CalledOnValidThread());
 
   next_state_ = STATE_NONE;
 
   while (!fetch_queue_.empty())
     fetch_queue_.pop();
   attempted_load_.clear();
@@ skipping 77 matching lines @@
 
   if (fetch_queue_.empty() || current_request_.get()) {
     next_state_ = STATE_NONE;
     return OK;
   }
 
   current_request_ = context_->CreateRequest(
       fetch_queue_.front(), IDLE, this, NULL);
   current_request_->SetLoadFlags(LOAD_DO_NOT_SEND_COOKIES |
                                  LOAD_DO_NOT_SAVE_COOKIES);
+  current_request_->net_log().AddEvent(NetLog::TYPE_SDCH_DICTIONARY_FETCH);
   buffer_ = new IOBuffer(kBufferSize);
   fetch_queue_.pop();
 
   next_state_ = STATE_REQUEST_STARTED;
   current_request_->Start();
 
   return OK;
 }
 
 int SdchDictionaryFetcher::DoRequestStarted(int rv) {
@@ skipping 39 matching lines @@
     next_state_ = STATE_REQUEST_COMPLETE;
 
   return OK;
 }
 
 int SdchDictionaryFetcher::DoCompleteRequest(int rv) {
   DCHECK(CalledOnValidThread());
 
   // If the dictionary was successfully fetched, add it to the manager.
   if (rv == OK)
-    consumer_->AddSdchDictionary(dictionary_, current_request_->url());
+    consumer_->AddSdchDictionary(
+        dictionary_, current_request_->url(), current_request_->net_log());
 
   current_request_.reset();
   buffer_ = NULL;
   dictionary_.clear();
 
   next_state_ = STATE_IDLE;
 
   return OK;
 }
 
 }  // namespace net