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

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
===================================================================
--- chrome/common/extensions/extension.h	(revision 177049)
+++ chrome/common/extensions/extension.h	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -55,8 +55,6 @@
 class Manifest;
 class PermissionSet;
 
-typedef std::set<std::string> OAuth2Scopes;
-
 // Represents a Chrome extension.
 class Extension : public base::RefCountedThreadSafe<Extension> {
  public:
@@ -171,17 +169,6 @@
     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();
@@ -703,7 +690,6 @@
   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; }
@@ -917,9 +903,6 @@
       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;
@@ -1135,9 +1118,6 @@
   // 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).