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

chrome/common/extensions/extension.h

-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.

[sail, 2013/01/23 20:23:15]

is this intentional?

[SanjoyPal, 2013/01/23 20:35:41]

Done. It was not intentional.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 
 #include <algorithm>
 #include <iosfwd>
 #include <map>
 #include <set>
@@ skipping 36 matching lines @@
 class ImageSkia;
 }
 
 FORWARD_DECLARE_TEST(TabStripModelTest, Apps);
 
 namespace extensions {
 
 class Manifest;
 class PermissionSet;
 
-typedef std::set<std::string> OAuth2Scopes;
-
 // Represents a Chrome extension.
 class Extension : public base::RefCountedThreadSafe<Extension> {
  public:
   struct InstallWarning;
   struct ManifestData;
 
   typedef std::vector<std::string> ScriptingWhitelist;
   typedef std::vector<InstallWarning> InstallWarningVector;
   typedef std::map<const std::string, linked_ptr<ManifestData> >
       ManifestDataMap;
@@ skipping 94 matching lines @@
     FilePath path;  // Path to the plugin.
     bool is_public;  // False if only this extension can load this plugin.
   };
 
   // An NaCl module included in the extension.
   struct NaClModuleInfo {
     GURL url;
     std::string mime_type;
   };
 
-  // OAuth2 info included in the extension.
-  struct OAuth2Info {
-    OAuth2Info();
-    ~OAuth2Info();
-
-    OAuth2Scopes GetScopesAsSet();
-
-    std::string client_id;
-    std::vector<std::string> scopes;
-  };
-
   struct ActionInfo {
     explicit ActionInfo();
     ~ActionInfo();
 
     // The types of extension actions.
     enum Type {
       TYPE_BROWSER,
       TYPE_PAGE,
       TYPE_SCRIPT_BADGE,
       TYPE_SYSTEM_INDICATOR,
@@ skipping 501 matching lines @@
   const InstallWarningVector& install_warnings() const {
     return install_warnings_;
   }
   const ExtensionIconSet& icons() const { return icons_; }
   const extensions::Manifest* manifest() const {
     return manifest_.get();
   }
   const std::string default_locale() const { return default_locale_; }
   bool incognito_split_mode() const { return incognito_split_mode_; }
   bool offline_enabled() const { return offline_enabled_; }
-  const OAuth2Info& oauth2_info() const { return oauth2_info_; }
   bool wants_file_access() const { return wants_file_access_; }
   int creation_flags() const { return creation_flags_; }
   bool from_webstore() const { return (creation_flags_ & FROM_WEBSTORE) != 0; }
   bool from_bookmark() const { return (creation_flags_ & FROM_BOOKMARK) != 0; }
   bool was_installed_by_default() const {
     return (creation_flags_ & WAS_INSTALLED_BY_DEFAULT) != 0;
   }
 
   // App-related.
   bool is_app() const {
@@ skipping 193 matching lines @@
                        void(UserScript::*add_method)(const std::string& glob),
                        UserScript* instance);
 
   // Helper method to load an ExtensionAction from the page_action or
   // browser_action entries in the manifest.
   scoped_ptr<ActionInfo> LoadExtensionActionInfoHelper(
       const base::DictionaryValue* manifest_section,
       ActionInfo::Type action_type,
       string16* error);
 
-  // Helper method that loads the OAuth2 info from the 'oauth2' manifest key.
-  bool LoadOAuth2Info(string16* error);
-
   // Returns true if the extension has more than one "UI surface". For example,
   // an extension that has a browser action and a page action.
   bool HasMultipleUISurfaces() const;
 
   // Updates the launch URL and extents for the extension using the given
   // |override_url|.
   void OverrideLaunchUrl(const GURL& override_url);
 
   // Custom checks for the experimental permission that can't be expressed in
   // _permission_features.json.
@@ skipping 195 matching lines @@
   // containers like panels and windows.
   int launch_width_;
   int launch_height_;
 
   // Should this app be shown in the app launcher.
   bool display_in_launcher_;
 
   // Should this app be shown in the browser New Tab Page.
   bool display_in_new_tab_page_;
 
-  // The OAuth2 client id and scopes, if specified by the extension.
-  OAuth2Info oauth2_info_;
-
   // Whether the extension has host permissions or user script patterns that
   // imply access to file:/// scheme URLs (the user may not have actually
   // granted it that access).
   bool wants_file_access_;
 
   // The flags that were passed to InitFromValue.
   int creation_flags_;
 
   // The Content-Security-Policy for this extension.  Extensions can use
   // Content-Security-Policies to mitigate cross-site scripting and other
@@ skipping 63 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_