Using API keys for requests to Chrome Web Store.

chrome/browser/intents/cws_intents_registry.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/intents/cws_intents_registry.h"
 
 #include "base/callback.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/message_bundle.h"
-#include "chrome/browser/intents/api_key.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/net/url_util.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
 #include "net/url_request/url_fetcher.h"
 
+// Forward declaration.

[Jói, 2012/09/17 16:56:19]

Seems simpler to just #include (and update DEPS if needed) but totally up to you
if you prefer to do it this way.

[Greg Billock, 2012/09/17 17:52:18]

Yes, let's #include

+namespace google_apis {
+std::string GetAPIKey();
+}
+
 namespace {
 
 // Limit for the number of suggestions we fix from CWS. Ideally, the registry
 // simply get all of them, but there is a) chunking on the CWS side, and b)
 // there is a cost with suggestions fetched. (Network overhead for favicons,
 // roundtrips to registry to check if installed).
 //
 // Since the picker limits the number of suggestions displayed to 5, 15 means
 // the suggestion list only has the potential to be shorter than that once the
 // user has at least 10 installed handlers for the particular action/type.
@@ skipping 193 matching lines @@
                                        const string16& type) {
   GURL request(kCWSIntentServiceURL);
   request = chrome_common_net::AppendQueryParameter(request, "intent",
                                                     UTF16ToUTF8(action));
   request = chrome_common_net::AppendQueryParameter(request, "mime_types",
                                                     UTF16ToUTF8(type));
   request = chrome_common_net::AppendQueryParameter(request, "start_index",
                                                     "0");
   request = chrome_common_net::AppendQueryParameter(request, "num_results",
                                                     kMaxSuggestions);
-  if (web_intents::kApiKey[0]) {
-    request = chrome_common_net::AppendQueryParameter(request, "key",
-                                                       web_intents::kApiKey);
-  }
+  request = chrome_common_net::AppendQueryParameter(request, "key",
+                                                    google_apis::GetAPIKey());

[Steve McKay, 2012/09/17 17:01:43]

Question, for Jói mostly. In the past when we needed to see actual suggestions
from the chrome web store in the picker we would add a real key to our api_key
file (and not check in).  With the new "GetAPIKey" call, will it return a useful
key allowing results to be returned, or will that only happen in release builds?

 
   return request;
 }