Cleanup: Remove legacy accessors from URLRequestContext.

content/browser/speech/google_streaming_remote_engine.cc

 // Copyright (c) 2012 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 "content/browser/speech/google_streaming_remote_engine.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/browser/speech/audio_buffer.h"
 #include "content/browser/speech/proto/google_streaming_api.pb.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
+#include "net/url_request/http_user_agent_settings.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using net::URLFetcher;
 
 namespace content {
 namespace {
 
@@ skipping 519 matching lines @@
 
 std::string GoogleStreamingRemoteEngine::GetAcceptedLanguages() const {
   std::string langs = config_.language;
   if (langs.empty() && url_context_.get()) {
     // If no language is provided then we use the first from the accepted
     // language list. If this list is empty then it defaults to "en-US".
     // Example of the contents of this list: "es,en-GB;q=0.8", ""
     net::URLRequestContext* request_context =
         url_context_->GetURLRequestContext();
     DCHECK(request_context);
-    // TODO(pauljensen): GoogleStreamingRemoteEngine should be constructed with
-    // a reference to the HttpUserAgentSettings rather than accessing the
-    // accept language through the URLRequestContext.

[pauljensen, 2013/12/02 15:24:42]

This comment should not be removed as the TODO has not been accomplished and is
still pertinent.

[Lei Zhang, 2013/12/11 03:32:24]

Done.

-    std::string accepted_language_list = request_context->GetAcceptLanguage();
+    std::string accepted_language_list;
+    if (request_context->http_user_agent_settings()) {
+      accepted_language_list =
+          request_context->http_user_agent_settings()->GetAcceptLanguage();
+    }
     size_t separator = accepted_language_list.find_first_of(",;");
     if (separator != std::string::npos)
       langs = accepted_language_list.substr(0, separator);
   }
   if (langs.empty())
     langs = "en-US";
   return langs;
 }
 
 // TODO(primiano): Is there any utility in the codebase that already does this?
 std::string GoogleStreamingRemoteEngine::GenerateRequestKey() const {
   const int64 kKeepLowBytes = GG_LONGLONG(0x00000000FFFFFFFF);
   const int64 kKeepHighBytes = GG_LONGLONG(0xFFFFFFFF00000000);
 
   // Just keep the least significant bits of timestamp, in order to reduce
   // probability of collisions.
   int64 key = (base::Time::Now().ToInternalValue() & kKeepLowBytes) |
               (base::RandUint64() & kKeepHighBytes);
   return base::HexEncode(reinterpret_cast<void*>(&key), sizeof(key));
 }
 
 GoogleStreamingRemoteEngine::FSMEventArgs::FSMEventArgs(FSMEvent event_value)
     : event(event_value) {
 }
 
 GoogleStreamingRemoteEngine::FSMEventArgs::~FSMEventArgs() {
 }
 
 }  // namespace content