Revert "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"
 #include "base/compiler_specific.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/load_flags.h"
-#include "net/base/sdch_net_log_params.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
 namespace {
 
 const int kBufferSize = 4096;
 
 }  // namespace
 
 namespace net {
 
 SdchDictionaryFetcher::SdchDictionaryFetcher(
     SdchFetcher::Delegate* consumer,
     URLRequestContext* context)
     : next_state_(STATE_NONE),
       in_loop_(false),
       consumer_(consumer),
       context_(context),
       weak_factory_(this) {
   DCHECK(CalledOnValidThread());
   DCHECK(consumer);
   DCHECK(context);
 }
 
 SdchDictionaryFetcher::~SdchDictionaryFetcher() {
   DCHECK(CalledOnValidThread());
 }
 
-bool SdchDictionaryFetcher::Schedule(const GURL& dictionary_url) {
+void 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)
-    return false;
-
-  if (attempted_load_.find(dictionary_url) != attempted_load_.end())
-    return false;
-
+  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;
+  }
   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 true;
 }
 
 void SdchDictionaryFetcher::Cancel() {
   DCHECK(CalledOnValidThread());
 
   next_state_ = STATE_NONE;
 
   while (!fetch_queue_.empty())
     fetch_queue_.pop();
   attempted_load_.clear();
@@ skipping 82 matching lines @@
 
   current_request_ = context_->CreateRequest(
       fetch_queue_.front(), IDLE, this, NULL);
   current_request_->SetLoadFlags(LOAD_DO_NOT_SEND_COOKIES |
                                  LOAD_DO_NOT_SAVE_COOKIES);
   buffer_ = new IOBuffer(kBufferSize);
   fetch_queue_.pop();
 
   next_state_ = STATE_REQUEST_STARTED;
   current_request_->Start();
-  current_request_->net_log().AddEvent(NetLog::TYPE_SDCH_DICTIONARY_FETCH);
 
   return OK;
 }
 
 int SdchDictionaryFetcher::DoRequestStarted(int rv) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(rv, OK);  // Can only come straight from above function.
 
   // The transition to STATE_REQUEST_READING occurs in the
   // OnResponseStarted() callback triggered by URLRequest::Start()
@@ skipping 21 matching lines @@
   int bytes_read = 0;
   if (!current_request_->Read(buffer_.get(), kBufferSize, &bytes_read)) {
     if (current_request_->status().is_io_pending())
       return ERR_IO_PENDING;
 
     if (current_request_->status().error() == OK) {
       // This "should never happen", but if it does the result will be
       // an infinite loop.  It's not clear how to handle a read failure
       // without a promise to invoke the callback at some point in the future,
       // so the request is failed.
-      LogDictionaryFetchError(SDCH_DICTIONARY_FETCH_READ_FAILED);
+      SdchManager::SdchErrorRecovery(SdchManager::DICTIONARY_FETCH_READ_FAILED);
       DLOG(FATAL) <<
           "URLRequest::Read() returned false without IO pending or error!";
       return ERR_FAILED;
     }
 
     return current_request_->status().error();
   }
 
   if (bytes_read != 0)
     dictionary_.append(buffer_->data(), bytes_read);
   else
     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) {
-    SdchProblemCode problem =
-        consumer_->AddSdchDictionary(dictionary_, current_request_->url());
-    if (problem != SDCH_OK)
-      LogDictionaryFetchError(problem);
-  }
+  if (rv == OK)
+    consumer_->AddSdchDictionary(dictionary_, current_request_->url());
 
   current_request_.reset();
   buffer_ = NULL;
   dictionary_.clear();
 
   next_state_ = STATE_IDLE;
 
   return OK;
 }
 
-void SdchDictionaryFetcher::LogDictionaryFetchError(SdchProblemCode error) {
-  CHECK(current_request_.get());
-  SdchManager::SdchErrorRecovery(error);
-  current_request_->net_log().AddEvent(
-      NetLog::TYPE_SDCH_DICTIONARY_ERROR,
-      base::Bind(&NetLogSdchDictionaryFetchProblemCallback,
-                 error,
-                 current_request_->url(),
-                 true));
-}
-
 }  // namespace net