[Extensions] Clean up some Permission[sData|Set] includes

Review URL: https://codereview.chromium.org/884903003

Cr-Commit-Position: refs/heads/master@{#315077}

chrome/browser/extensions/permission_message_combinations_unittest.cc

@@ -10,6 +10,7 @@
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
+#include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"

extensions/common/permissions/permission_set.cc

@@ -4,13 +4,8 @@
 
 #include "extensions/common/permissions/permission_set.h"
 
-#include <algorithm>
-#include <iterator>
-#include <string>
-
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/common/url_pattern.h"
-#include "extensions/common/url_pattern_set.h"
 #include "url/gurl.h"
 
 namespace extensions {

extensions/common/permissions/permission_set.h

@@ -5,16 +5,11 @@
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_SET_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_SET_H_
 
-#include <map>
 #include <set>
 #include <string>
-#include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/singleton.h"
-#include "base/strings/string16.h"
-#include "extensions/common/manifest.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/common/permissions/manifest_permission.h"
@@ -22,7 +17,6 @@
 #include "extensions/common/url_pattern_set.h"
 
 namespace extensions {
-class Extension;
 
 // The PermissionSet is an immutable class that encapsulates an
 // extension's permissions. The class exposes set operations for combining and

extensions/common/permissions/permissions_data.cc

@@ -8,14 +8,13 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
+#include "extensions/common/extension.h"
 #include "extensions/common/extensions_client.h"
-#include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/url_pattern_set.h"
-#include "extensions/common/user_script.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 

extensions/common/permissions/permissions_data.h

@@ -10,10 +10,8 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
-#include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permission_message.h"
@@ -22,17 +20,11 @@
 class GURL;
 
 namespace extensions {
-
-class PermissionSet;
 class Extension;
 class URLPatternSet;
-class UserScript;
 
-// A container for the active permissions of an extension.
-// TODO(rdevlin.cronin): For the love of everything good, rename this class to
-// ActivePermissions. We do *not* need PermissionsParser, PermissionSet,
-// PermissionInfo, and PermissionsData. No one will be able to keep them
-// straight.
+// A container for the permissions state of an extension, including active,
+// withheld, and tab-specific permissions.
 class PermissionsData {
  public:
   // The possible types of access for a given frame.

extensions/shell/browser/media_capture_util.cc

@@ -9,6 +9,7 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "content/public/browser/media_capture_devices.h"
+#include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 
 using content::MediaCaptureDevices;