Removing the project ID

chrome/browser/extensions/api/copresence/copresence_api.cc

 // Copyright 2014 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/extensions/api/copresence/copresence_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
@@ skipping 167 matching lines @@
 net::URLRequestContextGetter* CopresenceService::GetRequestContext() const {
   return browser_context_->GetRequestContext();
 }
 
 const std::string CopresenceService::GetPlatformVersionString() const {
   return chrome::VersionInfo().CreateVersionString();
 }
 
 const std::string
 CopresenceService::GetAPIKey(const std::string& app_id) const {
-  // This won't be const if we use map[]
+  // Check first if the app has set its key via the API.
   const auto& key = api_keys_by_app_.find(app_id);
-  return key == api_keys_by_app_.end() ? std::string() : key->second;
-}
+  if (key != api_keys_by_app_.end())
+    return key->second;
 
-const std::string
-CopresenceService::GetProjectId(const std::string& app_id) const {
-  const Extension* extension = ExtensionRegistry::Get(browser_context_)
-      ->GetExtensionById(app_id, ExtensionRegistry::ENABLED);
-  DCHECK(extension) << "Invalid extension ID";
-  CopresenceManifestData* manifest_data = static_cast<CopresenceManifestData*>(
-      extension->GetManifestData(manifest_keys::kCopresence));
-  return manifest_data ? manifest_data->project_id : std::string();
+  // If no key was found, look in the manifest.
+  if (!app_id.empty()) {
+    const Extension* extension = ExtensionRegistry::Get(browser_context_)
+        ->GetExtensionById(app_id, ExtensionRegistry::ENABLED);
+    DCHECK(extension) << "Invalid extension ID";
+    CopresenceManifestData* manifest_data =
+        static_cast<CopresenceManifestData*>(
+            extension->GetManifestData(manifest_keys::kCopresence));
+    if (manifest_data)
+      return manifest_data->api_key;
+  }
+
+  return std::string();
 }
 
 copresence::WhispernetClient* CopresenceService::GetWhispernetClient() {
   return whispernet_client();
 }
 
 gcm::GCMDriver* CopresenceService::GetGCMDriver() {
   gcm::GCMProfileService* gcm_service =
       gcm::GCMProfileServiceFactory::GetForProfile(browser_context_);
   return gcm_service ? gcm_service->driver() : nullptr;
@@ skipping 64 matching lines @@
                                       : api::copresence::EXECUTE_STATUS_FAILED;
   Respond(ArgumentList(api::copresence::Execute::Results::Create(api_status)));
 }
 
 // CopresenceSetApiKeyFunction implementation.
 ExtensionFunction::ResponseAction CopresenceSetApiKeyFunction::Run() {
   scoped_ptr<api::copresence::SetApiKey::Params> params(
       api::copresence::SetApiKey::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
+  LOG(WARNING) << "copresence.setApiKey() is deprecated. "
+               << "Put the key in the manifest at copresence.api_key instead.";
+
   // The api key may be set to empty, to clear it.
   CopresenceService::GetFactoryInstance()->Get(browser_context())
       ->set_api_key(extension_id(), params->api_key);
   return RespondNow(NoArguments());
 }
 
 // CopresenceSetAuthTokenFunction implementation
 ExtensionFunction::ResponseAction CopresenceSetAuthTokenFunction::Run() {
   scoped_ptr<api::copresence::SetAuthToken::Params> params(
       api::copresence::SetAuthToken::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   // The token may be set to empty, to clear it.
   CopresenceService::GetFactoryInstance()->Get(browser_context())
       ->set_auth_token(extension_id(), params->token);
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions