Remove PermissionsData::ForExtension() completely

chrome/browser/extensions/api/autotest_private/autotest_private_api.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/api/autotest_private/autotest_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #endif
 
 namespace extensions {
 namespace {
 
 base::ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) {
-  extensions::URLPatternSet pattern_set;
-  if (effective_perm) {
-    pattern_set = extensions::PermissionsData::ForExtension(ext)
-                      ->GetEffectiveHostPermissions();
-  } else {
+  URLPatternSet pattern_set;
+  if (effective_perm)
+    pattern_set = ext->permissions_data()->GetEffectiveHostPermissions();
+  else
     pattern_set = ext->GetActivePermissions()->explicit_hosts();
-  }
 
   base::ListValue* permissions = new base::ListValue;
-  for (extensions::URLPatternSet::const_iterator perm = pattern_set.begin();
-       perm != pattern_set.end(); ++perm) {
+  for (URLPatternSet::const_iterator perm = pattern_set.begin();
+       perm != pattern_set.end();
+       ++perm) {
     permissions->Append(new base::StringValue(perm->GetAsString()));
   }
 
   return permissions;
 }
 
 base::ListValue* GetAPIPermissions(const Extension* ext) {
   base::ListValue* permissions = new base::ListValue;
   std::set<std::string> perm_list =
       ext->GetActivePermissions()->GetAPIsAsStrings();
@@ skipping 87 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       RequestLockScreen();
 #endif
   return true;
 }
 
 bool AutotestPrivateGetExtensionsInfoFunction::RunSync() {
   DVLOG(1) << "AutotestPrivateGetExtensionsInfoFunction";
 
-  ExtensionService* service = extensions::ExtensionSystem::Get(
-      GetProfile())->extension_service();
-  ExtensionRegistry* registry =
-      extensions::ExtensionRegistry::Get(GetProfile());
+  ExtensionService* service =
+      ExtensionSystem::Get(GetProfile())->extension_service();
+  ExtensionRegistry* registry = ExtensionRegistry::Get(GetProfile());
   const ExtensionSet& extensions = registry->enabled_extensions();
   const ExtensionSet& disabled_extensions = registry->disabled_extensions();
   ExtensionActionManager* extension_action_manager =
       ExtensionActionManager::Get(GetProfile());
 
   base::ListValue* extensions_values = new base::ListValue;
   ExtensionList all;
   all.insert(all.end(), extensions.begin(), extensions.end());
   all.insert(all.end(), disabled_extensions.begin(), disabled_extensions.end());
   for (ExtensionList::const_iterator it = all.begin();
        it != all.end(); ++it) {
     const Extension* extension = it->get();
     std::string id = extension->id();
     base::DictionaryValue* extension_value = new base::DictionaryValue;
     extension_value->SetString("id", id);
     extension_value->SetString("version", extension->VersionString());
     extension_value->SetString("name", extension->name());
     extension_value->SetString("publicKey", extension->public_key());
     extension_value->SetString("description", extension->description());
-    extension_value->SetString("backgroundUrl",
-        extensions::BackgroundInfo::GetBackgroundURL(extension).spec());
+    extension_value->SetString(
+        "backgroundUrl", BackgroundInfo::GetBackgroundURL(extension).spec());
     extension_value->SetString("optionsUrl",
-        extensions::ManifestURL::GetOptionsPage(extension).spec());
+                               ManifestURL::GetOptionsPage(extension).spec());
 
     extension_value->Set("hostPermissions",
                          GetHostPermissions(extension, false));
     extension_value->Set("effectiveHostPermissions",
                          GetHostPermissions(extension, true));
     extension_value->Set("apiPermissions", GetAPIPermissions(extension));
 
     Manifest::Location location = extension->location();
     extension_value->SetBoolean("isComponent",
                                 location == Manifest::COMPONENT);
@@ skipping 51 matching lines @@
   return new AutotestPrivateAPI();
 }
 
 AutotestPrivateAPI::AutotestPrivateAPI() : test_mode_(false) {
 }
 
 AutotestPrivateAPI::~AutotestPrivateAPI() {
 }
 
 }  // namespace extensions