Add OAuth2 scopes to the ExtensionPermissionSet and granted permissions.

chrome/browser/extensions/extension_prefs_unittest.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 "extension_prefs_unittest.h"
 
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 153 matching lines @@
 class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
  public:
   virtual void Initialize() {
     extension_id_ = prefs_.AddExtensionAndReturnId("test");
 
     api_perm_set1_.insert(ExtensionAPIPermission::kTab);
     api_perm_set1_.insert(ExtensionAPIPermission::kBookmark);
 
     api_perm_set2_.insert(ExtensionAPIPermission::kHistory);
 
+    scopes_set1_.insert("scope1");
+
+    scopes_set2_.insert("scope1");
+    scopes_set2_.insert("scope2");
+    scopes_set2_.insert("scope3");
+
     AddPattern(&ehost_perm_set1_, "http://*.google.com/*");
     AddPattern(&ehost_perm_set1_, "http://example.com/*");
     AddPattern(&ehost_perm_set1_, "chrome://favicon/*");
 
     AddPattern(&ehost_perm_set2_, "https://*.google.com/*");
     // with duplicate:
     AddPattern(&ehost_perm_set2_, "http://*.google.com/*");
 
     AddPattern(&shost_perm_set1_, "http://reddit.com/r/test/*");
     AddPattern(&shost_perm_set2_, "http://reddit.com/r/test/*");
     AddPattern(&shost_perm_set2_, "http://somesite.com/*");
     AddPattern(&shost_perm_set2_, "http://example.com/*");
 
     ExtensionAPIPermissionSet expected_apis = api_perm_set1_;
 
     AddPattern(&ehost_permissions_, "http://*.google.com/*");
     AddPattern(&ehost_permissions_, "http://example.com/*");
     AddPattern(&ehost_permissions_, "chrome://favicon/*");
     AddPattern(&ehost_permissions_, "https://*.google.com/*");
 
     AddPattern(&shost_permissions_, "http://reddit.com/r/test/*");
     AddPattern(&shost_permissions_, "http://somesite.com/*");
     AddPattern(&shost_permissions_, "http://example.com/*");
 
+    scope_permissions_.insert("scope1");
+    scope_permissions_.insert("scope2");
+    scope_permissions_.insert("scope3");
+
     ExtensionAPIPermissionSet empty_set;
     URLPatternSet empty_extent;
+    ExtensionOAuth2Scopes empty_scopes;
     scoped_refptr<ExtensionPermissionSet> permissions;
     scoped_refptr<ExtensionPermissionSet> granted_permissions;
 
     // Make sure both granted api and host permissions start empty.
     granted_permissions =
         prefs()->GetGrantedPermissions(extension_id_);
     EXPECT_TRUE(granted_permissions->IsEmpty());
 
     permissions = new ExtensionPermissionSet(
         api_perm_set1_, empty_extent, empty_extent);
 
     // Add part of the api permissions.
     prefs()->AddGrantedPermissions(extension_id_, permissions.get());
     granted_permissions = prefs()->GetGrantedPermissions(extension_id_);
     EXPECT_TRUE(granted_permissions.get());
     EXPECT_FALSE(granted_permissions->IsEmpty());
     EXPECT_EQ(expected_apis, granted_permissions->apis());
     EXPECT_TRUE(granted_permissions->effective_hosts().is_empty());
     EXPECT_FALSE(granted_permissions->HasEffectiveFullAccess());
+    EXPECT_EQ(empty_scopes, granted_permissions->scopes());
     granted_permissions = NULL;
 
     // Add part of the explicit host permissions.
     permissions = new ExtensionPermissionSet(
         empty_set, ehost_perm_set1_, empty_extent);
     prefs()->AddGrantedPermissions(extension_id_, permissions.get());
     granted_permissions = prefs()->GetGrantedPermissions(extension_id_);
     EXPECT_FALSE(granted_permissions->IsEmpty());
     EXPECT_FALSE(granted_permissions->HasEffectiveFullAccess());
     EXPECT_EQ(expected_apis, granted_permissions->apis());
     EXPECT_EQ(ehost_perm_set1_,
               granted_permissions->explicit_hosts());
     EXPECT_EQ(ehost_perm_set1_,
               granted_permissions->effective_hosts());
+    EXPECT_EQ(empty_scopes, granted_permissions->scopes());
 
     // Add part of the scriptable host permissions.
     permissions = new ExtensionPermissionSet(
         empty_set, empty_extent, shost_perm_set1_);
     prefs()->AddGrantedPermissions(extension_id_, permissions.get());
     granted_permissions = prefs()->GetGrantedPermissions(extension_id_);
     EXPECT_FALSE(granted_permissions->IsEmpty());
     EXPECT_FALSE(granted_permissions->HasEffectiveFullAccess());
     EXPECT_EQ(expected_apis, granted_permissions->apis());
     EXPECT_EQ(ehost_perm_set1_,
               granted_permissions->explicit_hosts());
     EXPECT_EQ(shost_perm_set1_,
               granted_permissions->scriptable_hosts());
+    EXPECT_EQ(empty_scopes, granted_permissions->scopes());
 
     URLPatternSet::CreateUnion(ehost_perm_set1_, shost_perm_set1_,
                                &effective_permissions_);
     EXPECT_EQ(effective_permissions_, granted_permissions->effective_hosts());
 
-    // Add the rest of both the permissions.
+    // Add part of the oauth2 scopes.
     permissions = new ExtensionPermissionSet(
-       api_perm_set2_, ehost_perm_set2_, shost_perm_set2_);
+        empty_set, empty_extent, empty_extent, scopes_set1_);
+    prefs()->AddGrantedPermissions(extension_id_, permissions.get());
+    granted_permissions = prefs()->GetGrantedPermissions(extension_id_);
+    EXPECT_FALSE(granted_permissions->IsEmpty());
+    EXPECT_FALSE(granted_permissions->HasEffectiveFullAccess());
+    EXPECT_EQ(expected_apis, granted_permissions->apis());
+    EXPECT_EQ(ehost_perm_set1_,
+              granted_permissions->explicit_hosts());
+    EXPECT_EQ(shost_perm_set1_,
+              granted_permissions->scriptable_hosts());
+    EXPECT_EQ(scopes_set1_, granted_permissions->scopes());
+
+    // Add the rest of the permissions.
+    permissions = new ExtensionPermissionSet(
+        api_perm_set2_, ehost_perm_set2_, shost_perm_set2_, scopes_set2_);
 
     std::set_union(expected_apis.begin(), expected_apis.end(),
                    api_perm_set2_.begin(), api_perm_set2_.end(),
                    std::inserter(api_permissions_, api_permissions_.begin()));
 
     prefs()->AddGrantedPermissions(extension_id_, permissions.get());
     granted_permissions = prefs()->GetGrantedPermissions(extension_id_);
     EXPECT_TRUE(granted_permissions.get());
     EXPECT_FALSE(granted_permissions->IsEmpty());
     EXPECT_EQ(api_permissions_, granted_permissions->apis());
     EXPECT_EQ(ehost_permissions_,
               granted_permissions->explicit_hosts());
     EXPECT_EQ(shost_permissions_,
               granted_permissions->scriptable_hosts());
+    EXPECT_EQ(scope_permissions_, granted_permissions->scopes());
     effective_permissions_.ClearPatterns();
     URLPatternSet::CreateUnion(ehost_permissions_, shost_permissions_,
                                &effective_permissions_);
     EXPECT_EQ(effective_permissions_, granted_permissions->effective_hosts());
   }
 
   virtual void Verify() {
     scoped_refptr<ExtensionPermissionSet> permissions(
         prefs()->GetGrantedPermissions(extension_id_));
     EXPECT_TRUE(permissions.get());
     EXPECT_FALSE(permissions->HasEffectiveFullAccess());
     EXPECT_EQ(api_permissions_, permissions->apis());
     EXPECT_EQ(ehost_permissions_,
               permissions->explicit_hosts());
     EXPECT_EQ(shost_permissions_,
               permissions->scriptable_hosts());
+    EXPECT_EQ(scope_permissions_,
+              permissions->scopes());
   }
 
  private:
   std::string extension_id_;
   ExtensionAPIPermissionSet api_perm_set1_;
   ExtensionAPIPermissionSet api_perm_set2_;
   URLPatternSet ehost_perm_set1_;
   URLPatternSet ehost_perm_set2_;
   URLPatternSet shost_perm_set1_;
   URLPatternSet shost_perm_set2_;
+  ExtensionOAuth2Scopes scopes_set1_;
+  ExtensionOAuth2Scopes scopes_set2_;
 
   ExtensionAPIPermissionSet api_permissions_;
   URLPatternSet ehost_permissions_;
   URLPatternSet shost_permissions_;
+  ExtensionOAuth2Scopes scope_permissions_;
   URLPatternSet effective_permissions_;
 };
 TEST_F(ExtensionPrefsGrantedPermissions, GrantedPermissions) {}
 
 // Tests the SetActivePermissions / GetActivePermissions functions.
 class ExtensionPrefsActivePermissions : public ExtensionPrefsTest {
  public:
   virtual void Initialize() {
     extension_id_ = prefs_.AddExtensionAndReturnId("test");
 
     ExtensionAPIPermissionSet api_perms;
     api_perms.insert(ExtensionAPIPermission::kTab);
     api_perms.insert(ExtensionAPIPermission::kBookmark);
     api_perms.insert(ExtensionAPIPermission::kHistory);
 
     URLPatternSet ehosts;
     AddPattern(&ehosts, "http://*.google.com/*");
     AddPattern(&ehosts, "http://example.com/*");
     AddPattern(&ehosts, "chrome://favicon/*");
 
     URLPatternSet shosts;
     AddPattern(&shosts, "https://*.google.com/*");
     AddPattern(&shosts, "http://reddit.com/r/test/*");
 
-    active_perms_ = new ExtensionPermissionSet(api_perms, ehosts, shosts);
+    ExtensionOAuth2Scopes scopes;
+    scopes.insert("my-new-scope");
+
+    active_perms_ = new ExtensionPermissionSet(
+        api_perms, ehosts, shosts, scopes);
 
     // Make sure the active permissions start empty.
     scoped_refptr<ExtensionPermissionSet> active(
         prefs()->GetActivePermissions(extension_id_));
     EXPECT_TRUE(active->IsEmpty());
 
     // Set the active permissions.
     prefs()->SetActivePermissions(extension_id_, active_perms_.get());
     active = prefs()->GetActivePermissions(extension_id_);
     EXPECT_EQ(active_perms_->apis(), active->apis());
     EXPECT_EQ(active_perms_->explicit_hosts(), active->explicit_hosts());
     EXPECT_EQ(active_perms_->scriptable_hosts(), active->scriptable_hosts());
+    EXPECT_EQ(active_perms_->scopes(), active->scopes());
     EXPECT_EQ(*active_perms_, *active);
   }
 
   virtual void Verify() {
     scoped_refptr<ExtensionPermissionSet> permissions(
         prefs()->GetActivePermissions(extension_id_));
     EXPECT_EQ(*active_perms_, *permissions);
   }
 
  private:
@@ skipping 747 matching lines @@
       ++iteration_;
     } else {
       EXPECT_EQ(kDefaultPref1, actual);
     }
   }
 
  private:
   int iteration_;
 };
 TEST_F(ExtensionPrefsDisableExtensions, ExtensionPrefsDisableExtensions) {}