Refactor PermissionsData pt1

chrome/browser/extensions/crx_installer.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/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 278 matching lines @@
     }
   }
 
   // Make sure the manifests match if we want to bypass the prompt.
   if (approved_) {
     bool valid = false;
     if (expected_manifest_check_level_ ==
         WebstoreInstaller::MANIFEST_CHECK_LEVEL_NONE) {
         // To skip manifest checking, the extension must be a shared module
         // and not request any permissions.
-        if (SharedModuleInfo::IsSharedModule(extension) &&
-            PermissionsData::GetActivePermissions(extension)->IsEmpty()) {
+      if (SharedModuleInfo::IsSharedModule(extension) &&

[not at google - send to devlin, 2014/06/02 23:20:06]

here

[Devlin, 2014/06/03 15:28:21]

Not done. No speed advantage and given that we refer to multiple
permissionsdatas here, I think it would make it more confusing.

+          PermissionsData::ForExtension(extension)
+              ->active_permissions()
+              ->IsEmpty()) {
           valid = true;
         }
     } else {
       valid = expected_manifest_->Equals(original_manifest_.get());
       if (!valid && expected_manifest_check_level_ ==
           WebstoreInstaller::MANIFEST_CHECK_LEVEL_LOOSE) {
         std::string error;
         scoped_refptr<Extension> dummy_extension =
             Extension::Create(base::FilePath(),
                               install_source_,
                               *expected_manifest_->value(),
                               creation_flags_,
                               &error);
         if (error.empty()) {
           scoped_refptr<const PermissionSet> expected_permissions =
-              PermissionsData::GetActivePermissions(dummy_extension.get());
+              PermissionsData::ForExtension(dummy_extension)
+                  ->active_permissions();
           valid = !(PermissionMessageProvider::Get()->IsPrivilegeIncrease(
-                        expected_permissions,
-                        PermissionsData::GetActivePermissions(extension),
-                        extension->GetType()));
+              expected_permissions,
+              PermissionsData::ForExtension(extension)->active_permissions(),
+              extension->GetType()));
         }
       }
     }
 
     if (!valid)
       return CrxInstallerError(
           l10n_util::GetStringUTF16(IDS_EXTENSION_MANIFEST_INVALID));
   }
 
   // The checks below are skipped for themes and external installs.
@@ skipping 576 matching lines @@
   if (!prefs->DidExtensionEscalatePermissions(extension()->id()))
     return;
 
   if (client_) {
     AddRef();  // Balanced in InstallUIProceed() and InstallUIAbort().
     client_->ConfirmReEnable(this, extension());
   }
 }
 
 }  // namespace extensions