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

chrome/browser/extensions/permissions_updater.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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/permissions_updater.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
 #include "chrome/common/extensions/api/permissions.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "google_apis/gaia/oauth2_mint_token_flow.h"
 
 using content::RenderProcessHost;
@@ skipping 14 matching lines @@
                             public content::NotificationObserver {
  public:
   OAuth2GrantRecorder(Profile* profile, const Extension* extension)
     : ALLOW_THIS_IN_INITIALIZER_LIST(flow_(
           profile->GetRequestContext(),
           this,
           OAuth2MintTokenFlow::Parameters(
               TokenServiceFactory::GetForProfile(profile)->
                   GetOAuth2LoginRefreshToken(),
               extension->id(),
-              extension->oauth2_info().client_id,
-              extension->oauth2_info().scopes,
+              extensions::OAuth2Info::GetOAuth2Info(extension).client_id,

[Devlin, 2013/01/17 22:53:05]

nit: don't need to have extensions:: prefix in this file.

[SanjoyPal, 2013/01/18 02:08:50]

Done.

+              extensions::OAuth2Info::GetOAuth2Info(extension).scopes,
               OAuth2MintTokenFlow::MODE_RECORD_GRANT))) {
     notification_registrar_.Add(this,
                                 chrome::NOTIFICATION_PROFILE_DESTROYED,
                                 content::Source<Profile>(profile));
 
     flow_.Start();
   }
 
   // content::NotificationObserver:
   void Observe(int type,
@@ skipping 71 matching lines @@
   // We only maintain the granted permissions prefs for INTERNAL and LOAD
   // extensions.
   if (extension->location() != Extension::LOAD &&
       extension->location() != Extension::INTERNAL)
     return;
 
   if (record_oauth2_grant) {
     // Only record OAuth grant if:
     // 1. The extension has client id and scopes.
     // 2. The user is signed in to Chrome.
-    const Extension::OAuth2Info& oauth2_info = extension->oauth2_info();
+    const extensions::OAuth2Info& oauth2_info =
+        extensions::OAuth2Info::GetOAuth2Info(extension);
     if (!oauth2_info.client_id.empty() && !oauth2_info.scopes.empty()) {
       TokenService* token_service = TokenServiceFactory::GetForProfile(
           profile_);
       if (token_service && token_service->HasOAuthLoginToken()) {
         new OAuth2GrantRecorder(profile_, extension);
       }
     }
   }
 
   GetExtensionPrefs()->AddGrantedPermissions(extension->id(),
@@ skipping 68 matching lines @@
   // Trigger the onAdded and onRemoved events in the extension.
   DispatchEvent(extension->id(), event_name, changed);
 }
 
 ExtensionPrefs* PermissionsUpdater::GetExtensionPrefs() {
   return extensions::ExtensionSystem::Get(profile_)->extension_service()->
       extension_prefs();
 }
 
 }  // namespace extensions