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

chrome/browser/extensions/extension_install_prompt.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/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.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_window.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
@@ skipping 550 matching lines @@
   // |extension_| may be NULL, e.g. in the bundle install case.
   if (!extension_ ||
       prompt_.type() == BUNDLE_INSTALL_PROMPT ||
       prompt_.type() == INLINE_INSTALL_PROMPT ||
       prompt_.type() == EXTERNAL_INSTALL_PROMPT ||
       prompt_.GetOAuthIssueCount() != 0U) {
     ShowConfirmation();
     return;
   }
 
-  const Extension::OAuth2Info& oauth2_info = extension_->oauth2_info();
-  if (oauth2_info.client_id.empty() ||
-      oauth2_info.scopes.empty()) {
+  const extensions::OAuth2Info* oauth2_info =
+      extensions::OAuth2Info::GetOAuth2Info(extension_);
+  if (oauth2_info->client_id.empty() ||
+      oauth2_info->scopes.empty()) {
     ShowConfirmation();
     return;
   }
 
   Profile* profile = install_ui_->profile();
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile);
 
   token_flow_.reset(new OAuth2MintTokenFlow(
       profile->GetRequestContext(),
       this,
       OAuth2MintTokenFlow::Parameters(
           token_service->GetOAuth2LoginRefreshToken(),
           extension_->id(),
-          oauth2_info.client_id,
-          oauth2_info.scopes,
+          oauth2_info->client_id,
+          oauth2_info->scopes,
           OAuth2MintTokenFlow::MODE_ISSUE_ADVICE)));
   token_flow_->Start();
 }
 
 void ExtensionInstallPrompt::OnIssueAdviceSuccess(
     const IssueAdviceInfo& advice_info) {
   prompt_.SetOAuthIssueAdvice(advice_info);
   record_oauth2_grant_ = true;
   ShowConfirmation();
 }
@@ skipping 31 matching lines @@
   }
 
   if (AutoConfirmPrompt(delegate_))
     return;
 
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
   else
     show_dialog_callback_.Run(show_params_, delegate_, prompt_);
 }