Remove the --speech-service-key command line flag.

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"
@@ skipping 41 matching lines @@
       const proto::SpeechRecognitionAlternative& alt =
           res.alternative(j);
       if (alt.has_confidence())
         DVLOG(1) << "    CONFIDENCE:\t" << alt.confidence();
       if (alt.has_transcript())
         DVLOG(1) << "    TRANSCRIPT:\t" << alt.transcript();
     }
   }
 }
 
-std::string GetAPIKey() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kSpeechRecognitionWebserviceKey)) {
-    DVLOG(1) << "GetAPIKey() used key from command-line.";
-    return command_line.GetSwitchValueASCII(
-        switches::kSpeechRecognitionWebserviceKey);
-  }
-
-  std::string api_key = google_apis::GetAPIKey();
-  if (api_key.empty())
-    DVLOG(1) << "GetAPIKey() returned empty string!";
-
-  return api_key;
-}
-
 }  // namespace
 
 const int GoogleStreamingRemoteEngine::kAudioPacketIntervalMs = 100;
 const int GoogleStreamingRemoteEngine::kUpstreamUrlFetcherIdForTesting = 0;
 const int GoogleStreamingRemoteEngine::kDownstreamUrlFetcherIdForTesting = 1;
 const int GoogleStreamingRemoteEngine::kWebserviceStatusNoError = 0;
 const int GoogleStreamingRemoteEngine::kWebserviceStatusErrorNoMatch = 5;
 
 GoogleStreamingRemoteEngine::GoogleStreamingRemoteEngine(
     net::URLRequestContextGetter* context)
@@ skipping 213 matching lines @@
 
   encoder_.reset(AudioEncoder::Create(kDefaultAudioCodec,
                                       config_.audio_sample_rate,
                                       config_.audio_num_bits_per_sample));
   DCHECK(encoder_.get());
   const std::string request_key = GenerateRequestKey();
 
   // Setup downstream fetcher.
   std::vector<std::string> downstream_args;
   downstream_args.push_back(
-      "key=" + net::EscapeQueryParamValue(GetAPIKey(), true));
+      "key=" + net::EscapeQueryParamValue(google_apis::GetAPIKey(), true));
   downstream_args.push_back("pair=" + request_key);
   downstream_args.push_back("output=pb");
   GURL downstream_url(std::string(kWebServiceBaseUrl) +
                       std::string(kDownstreamUrl) +
                       JoinString(downstream_args, '&'));
 
   downstream_fetcher_.reset(URLFetcher::Create(
       kDownstreamUrlFetcherIdForTesting, downstream_url, URLFetcher::GET,
       this));
   downstream_fetcher_->SetRequestContext(url_context_.get());
   downstream_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                                     net::LOAD_DO_NOT_SEND_COOKIES |
                                     net::LOAD_DO_NOT_SEND_AUTH_DATA);
   downstream_fetcher_->Start();
 
   // Setup upstream fetcher.
   // TODO(hans): Support for user-selected grammars.
   std::vector<std::string> upstream_args;
   upstream_args.push_back("key=" +
-      net::EscapeQueryParamValue(GetAPIKey(), true));
+      net::EscapeQueryParamValue(google_apis::GetAPIKey(), true));
   upstream_args.push_back("pair=" + request_key);
   upstream_args.push_back("output=pb");
   upstream_args.push_back(
       "lang=" + net::EscapeQueryParamValue(GetAcceptedLanguages(), true));
   upstream_args.push_back(
       config_.filter_profanities ? "pFilter=2" : "pFilter=0");
   if (config_.max_hypotheses > 0U) {
     int max_alternatives = std::min(kMaxMaxAlternatives,
                                     config_.max_hypotheses);
     upstream_args.push_back("maxAlternatives=" +
@@ skipping 239 matching lines @@
 }
 
 GoogleStreamingRemoteEngine::FSMEventArgs::FSMEventArgs(FSMEvent event_value)
     : event(event_value) {
 }
 
 GoogleStreamingRemoteEngine::FSMEventArgs::~FSMEventArgs() {
 }
 
 }  // namespace content