Fixing spelling service to use GetAPIKey.

chrome/browser/spellchecker/spelling_service_client.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 "chrome/browser/spellchecker/spelling_service_client.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/spellcheck_result.h"
 #include "content/public/browser/browser_thread.h"
+#include "google_apis/google_api_keys.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "unicode/uloc.h"
 
-#if defined(GOOGLE_CHROME_BUILD)
-#include "chrome/browser/spellchecker/internal/spellcheck_internal.h"
-#endif
-
-// Use the public URL to the Spelling service on Chromium. Unfortunately, this
-// service is an experimental service and returns an error without a key.
-#ifndef SPELLING_SERVICE_KEY_V1
-#define SPELLING_SERVICE_KEY_V1 ""
-#endif
-
-#ifndef SPELLING_SERVICE_KEY_V2
-#define SPELLING_SERVICE_KEY_V2 ""
-#endif
-
+// Use the public URL to the Spelling service on Chromium.
 #ifndef SPELLING_SERVICE_URL
 #define SPELLING_SERVICE_URL "https://www.googleapis.com/rpc"
 #endif
 
 SpellingServiceClient::SpellingServiceClient() : tag_(0) {
 }
 
 SpellingServiceClient::~SpellingServiceClient() {
 }
 
@@ skipping 32 matching lines @@
   std::string encoded_text;
   base::JsonDoubleQuote(text, false, &encoded_text);
 
   static const char kSpellingRequest[] =
       "{"
       "\"method\":\"spelling.check\","
       "\"apiVersion\":\"v%d\","
       "\"params\":{"
       "\"text\":\"%s\","
       "\"language\":\"%s\","
-      "\"origin_country\":\"%s\","
+      "\"originCountry\":\"%s\","
       "\"key\":\"%s\""
       "}"
       "}";
+  std::string api_key = google_apis::GetAPIKey();
   std::string request = base::StringPrintf(
       kSpellingRequest,
       type,
       encoded_text.c_str(),
       language,
       country,
-      type == SUGGEST ? SPELLING_SERVICE_KEY_V1 : SPELLING_SERVICE_KEY_V2);
+      api_key.c_str());

[groby-ooo-7-16, 2012/09/19 23:06:05]

Oh. Now I see it :)

 
   static const char kSpellingServiceURL[] = SPELLING_SERVICE_URL;
   GURL url = GURL(kSpellingServiceURL);
   fetcher_.reset(CreateURLFetcher(url));
   fetcher_->SetRequestContext(profile->GetRequestContext());
   fetcher_->SetUploadData("application/json", request);
   fetcher_->SetLoadFlags(
       net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher_->Start();
   tag_ = tag;
@@ skipping 115 matching lines @@
     if (!suggestions->GetDictionary(0, &suggestion) ||
         !suggestion->GetString("suggestion", &replacement)) {
       return false;
     }
     SpellCheckResult result(
         SpellCheckResult::SPELLING, start, length, replacement);
     results->push_back(result);
   }
   return true;
 }