Move "oauth2" manifest key parsing out of Extension class.

chrome/browser/extensions/api/identity/identity_api.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/extensions/api/identity/identity_api.h"
 
+#include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/experimental_identity.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
+#include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace extensions {
 
 namespace identity_constants {
 const char kInvalidClientId[] = "Invalid OAuth2 Client ID.";
 const char kInvalidScopes[] = "Invalid OAuth2 scopes.";
 const char kAuthFailure[] = "OAuth2 request failed: ";
 const char kNoGrant[] = "OAuth2 not granted or revoked.";
 const char kUserRejected[] = "The user did not approve access.";
 const char kUserNotSignedIn[] = "The user is not signed in.";
 const char kInvalidRedirect[] = "Did not redirect to the right URL.";
 }

[Devlin, 2013/01/14 20:18:34]

since you're in the file, please add a "// namespace identity_constants" here
(it's short enough that it's not critical, but typically anything more than five
lines should have it).

[SanjoyPal, 2013/01/16 19:10:52]

Done.

 
 namespace GetAuthToken = extensions::api::experimental_identity::GetAuthToken;
 namespace LaunchWebAuthFlow =
     extensions::api::experimental_identity::LaunchWebAuthFlow;
 namespace identity = extensions::api::experimental_identity;
 
 IdentityGetAuthTokenFunction::IdentityGetAuthTokenFunction()
     : interactive_(false) {}
 IdentityGetAuthTokenFunction::~IdentityGetAuthTokenFunction() {}
 
 bool IdentityGetAuthTokenFunction::RunImpl() {
   scoped_ptr<GetAuthToken::Params> params(GetAuthToken::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   if (params->details.get() && params->details->interactive.get())
     interactive_ = *params->details->interactive;
 
-  const Extension::OAuth2Info& oauth2_info = GetExtension()->oauth2_info();
+  const extensions::OAuth2Info* oauth2_info =

[Devlin, 2013/01/14 20:18:34]

You're in the extensions namespace - you don't need the prefix.

[SanjoyPal, 2013/01/16 19:10:52]

Done.

+      OAuth2Info::GetOAuth2Info(GetExtension());
 
   // Check that the necessary information is present in the manfist.
-  if (oauth2_info.client_id.empty()) {
+  if (oauth2_info->client_id.empty()) {
     error_ = identity_constants::kInvalidClientId;
     return false;
   }
 
-  if (oauth2_info.scopes.size() == 0) {
+  if (oauth2_info->scopes.size() == 0) {
     error_ = identity_constants::kInvalidScopes;
     return false;
   }
 
   // Balanced in OnIssueAdviceSuccess|OnMintTokenSuccess|OnMintTokenFailure|
   // InstallUIAbort|OnLoginUIClosed.
   AddRef();
 
   if (!HasLoginToken()) {
     if (StartLogin()) {
@@ skipping 104 matching lines @@
   login_ui_service->ShowLoginPopup();
 }
 
 void IdentityGetAuthTokenFunction::ShowOAuthApprovalDialog(
     const IssueAdviceInfo& issue_advice) {
   install_ui_->ConfirmIssueAdvice(this, GetExtension(), issue_advice);
 }
 
 OAuth2MintTokenFlow* IdentityGetAuthTokenFunction::CreateMintTokenFlow(
     OAuth2MintTokenFlow::Mode mode) {
-  const Extension::OAuth2Info& oauth2_info = GetExtension()->oauth2_info();
+  const extensions::OAuth2Info* oauth2_info =
+      OAuth2Info::GetOAuth2Info(GetExtension());
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile());
   return new OAuth2MintTokenFlow(
       profile()->GetRequestContext(),
       this,
       OAuth2MintTokenFlow::Parameters(
           token_service->GetOAuth2LoginRefreshToken(),
           GetExtension()->id(),
-          oauth2_info.client_id,
-          oauth2_info.scopes,
+          oauth2_info->client_id,
+          oauth2_info->scopes,
           mode));
 }
 
 bool IdentityGetAuthTokenFunction::HasLoginToken() const {
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile());
   return token_service->HasOAuthLoginToken();
 }
 
 IdentityLaunchWebAuthFlowFunction::IdentityLaunchWebAuthFlowFunction() {}
 IdentityLaunchWebAuthFlowFunction::~IdentityLaunchWebAuthFlowFunction() {}
@@ skipping 39 matching lines @@
   SendResponse(true);
   Release();  // Balanced in RunImpl.
 }
 
 void IdentityLaunchWebAuthFlowFunction::OnAuthFlowFailure() {
   error_ = identity_constants::kInvalidRedirect;
   SendResponse(false);
   Release();  // Balanced in RunImpl.
 }
 
+IdentityAPI::IdentityAPI(Profile* profile) {
+  ManifestHandler::Register(extension_manifest_keys::kOAuth2,

[Devlin, 2013/01/14 20:18:34]

Include what you use - c/c/e/manifest_handler.h.

[SanjoyPal, 2013/01/16 19:10:52]

Done.

+                            new OAuth2ManifestHandler);
+}
+
+IdentityAPI::~IdentityAPI() {
+}
+
+static base::LazyInstance<ProfileKeyedAPIFactory<IdentityAPI> >
+g_factory = LAZY_INSTANCE_INITIALIZER;

[Devlin, 2013/01/14 20:18:34]

Indentation.

[SanjoyPal, 2013/01/16 19:10:52]

Done.

+
+// static
+ProfileKeyedAPIFactory<IdentityAPI>* IdentityAPI::GetFactoryInstance() {
+  return &g_factory.Get();
+}
+
 }  // namespace extensions