Refactor PermissionsData pt1

chrome/browser/media_galleries/media_galleries_preferences.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/media_galleries/media_galleries_preferences.h"
 
 #include "base/base_paths_posix.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
@@ skipping 78 matching lines @@
   if (!profile)
     return count;
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (!extension_service)
     return count;
 
   const extensions::ExtensionSet* extensions = extension_service->extensions();
   for (extensions::ExtensionSet::const_iterator i = extensions->begin();
        i != extensions->end(); ++i) {
-    if (extensions::PermissionsData::HasAPIPermission(
-            *i, extensions::APIPermission::kMediaGalleries) ||
-        extensions::PermissionsData::HasAPIPermission(
-            *i, extensions::APIPermission::kMediaGalleriesPrivate)) {
+    if (extensions::PermissionsData::ForExtension(*i)

[Lei Zhang, 2014/06/02 22:40:31]

I'm only looking at the media galleries bits.

Here, you can save the returned pointer from
extensions::PermissionsData::ForExtension(*i) and use it again on the next line
to avoid having to write "->" on a separate line.

On the topic of these very long lines of code, I think the aussies have been
writing:

very_long_line->
    method()

rather than:

very_long_line
    ->method()

We should try to be consistent there.

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

Happy to do both.  As Kalman points out, git cl format prefers newline ->, but
OWNERs preference takes precedence.

+            ->HasAPIPermission(extensions::APIPermission::kMediaGalleries) ||
+        extensions::PermissionsData::ForExtension(*i)->HasAPIPermission(
+            extensions::APIPermission::kMediaGalleriesPrivate)) {
       count++;
     }
   }
   return count;
 }
 
 bool GetPrefId(const base::DictionaryValue& dict, MediaGalleryPrefId* value) {
   std::string string_id;
   if (!dict.GetString(kMediaGalleriesPrefIdKey, &string_id) ||
       !base::StringToUint64(string_id, value)) {
@@ skipping 157 matching lines @@
   // means it may be overwritten simply by getting new volume metadata.
   // A display_name with version 1 should not be overwritten.
   dict->SetInteger(kMediaGalleriesPrefsVersionKey, gallery.prefs_version);
 
   return dict;
 }
 
 bool HasAutoDetectedGalleryPermission(const extensions::Extension& extension) {
   extensions::MediaGalleriesPermission::CheckParam param(
       extensions::MediaGalleriesPermission::kAllAutoDetectedPermission);
-  return extensions::PermissionsData::CheckAPIPermissionWithParam(
-      &extension, extensions::APIPermission::kMediaGalleries, &param);
+  return extensions::PermissionsData::ForExtension(&extension)
+      ->CheckAPIPermissionWithParam(extensions::APIPermission::kMediaGalleries,
+                                    &param);
 }
 
 // Retrieves the MediaGalleryPermission from the given dictionary; DCHECKs on
 // failure.
 bool GetMediaGalleryPermissionFromDictionary(
     const base::DictionaryValue* dict,
     MediaGalleryPermission* out_permission) {
   std::string string_id;
   if (dict->GetString(kMediaGalleryIdKey, &string_id) &&
       base::StringToUint64(string_id, &out_permission->pref_id) &&
@@ skipping 944 matching lines @@
   if (extension_prefs_for_testing_)
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   DCHECK(IsInitialized());
   extension_prefs_for_testing_ = extension_prefs;
 }