Move extension_error_utils.* and url_pattern_set.* into

chrome/common/extensions/permissions/permission_set.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_SET_H_
 #define CHROME_COMMON_EXTENSIONS_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/string16.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
 #include "chrome/common/extensions/permissions/permission_message.h"
-#include "chrome/common/extensions/url_pattern_set.h"
+#include "extensions/common/url_pattern_set.h"
 
 namespace extensions {
 
 // The PermissionSet is an immutable class that encapsulates an
 // extension's permissions. The class exposes set operations for combining and
 // manipulating the permissions.
 class PermissionSet
     : public base::RefCountedThreadSafe<PermissionSet> {
  public:
   // Creates an empty permission set (e.g. default permissions).
@@ skipping 160 matching lines @@
   // TODO(jstritar): Rename to "user_script_hosts_"?
   URLPatternSet scriptable_hosts_;
 
   // The list of hosts this effectively grants access to.
   URLPatternSet effective_hosts_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_SET_H_