Cleanup: Remove legacy accessors from URLRequestContext.

content/browser/speech/google_one_shot_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_one_shot_remote_engine.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "content/browser/speech/audio_buffer.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"
 
 namespace content {
 namespace {
 
 const char* const kDefaultSpeechRecognitionUrl =
     "https://www.google.com/speech-api/v1/recognize?xjerr=1&client=chromium&";
@@ skipping 135 matching lines @@
   DCHECK(!url_fetcher_.get());
   std::string lang_param = config_.language;
 
   if (lang_param.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): GoogleOneShotRemoteEngine should be constructed with

[no longer working on chromium, 2013/12/30 12:35:15]

remove this TODO if your CL has addressed it.

[Lei Zhang, 2014/01/08 22:44:25]

nay

     // a reference to the HttpUserAgentSettings rather than accessing the
     // accept language through the URLRequestContext.
-    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(",;");
     lang_param = accepted_language_list.substr(0, separator);

[no longer working on chromium, 2013/12/30 12:35:15]

move these two lines into the if case, and also move the declaration of
accepted_language_list there

[no longer working on chromium, 2013/12/30 12:35:15]

how about checking if (separator != std::string::npos) before doing the
substring

[Lei Zhang, 2014/01/08 22:44:25]

Done.

[Lei Zhang, 2014/01/08 22:44:25]

I see this deviates from google_streaming_remote_engine.cc, but since I'm just
refactoring, I'm inclined to just leave this alone rather than change the
behavior in some subtle way.

   }
 
   if (lang_param.empty())
     lang_param = "en-US";
 
   std::vector<std::string> parts;
   parts.push_back("lang=" + net::EscapeQueryParamValue(lang_param, true));
 
   if (!config_.grammars.empty()) {
     DCHECK_EQ(config_.grammars.size(), 1U);
@@ skipping 96 matching lines @@
 
 bool GoogleOneShotRemoteEngine::IsRecognitionPending() const {
   return url_fetcher_ != NULL;
 }
 
 int GoogleOneShotRemoteEngine::GetDesiredAudioChunkDurationMs() const {
   return kAudioPacketIntervalMs;
 }
 
 }  // namespace content