summaryrefslogtreecommitdiffstats
path: root/chrome/browser/themes/theme_syncable_service_unittest.cc
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 01:08:29 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 01:08:29 +0000
commit5a55f3f8ab42c7d3f6f116bba04de638ea510c5b (patch)
tree5ef96f37f486fe9e6e8a45a89bbfa5e2c218ac8c /chrome/browser/themes/theme_syncable_service_unittest.cc
parent6065748f99f48c4cc0d34600b7cc3c2de8d1c0e4 (diff)
downloadchromium_src-5a55f3f8ab42c7d3f6f116bba04de638ea510c5b.zip
chromium_src-5a55f3f8ab42c7d3f6f116bba04de638ea510c5b.tar.gz
chromium_src-5a55f3f8ab42c7d3f6f116bba04de638ea510c5b.tar.bz2
Move PermissionSet to top-level extensions.
BUG=310171 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/42723002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes/theme_syncable_service_unittest.cc')
-rw-r--r--chrome/browser/themes/theme_syncable_service_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index 42ae85f..82e721b 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -17,11 +17,11 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/manifest_url_handler.h"
-#include "chrome/common/extensions/permissions/permission_set.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread.h"
#include "extensions/common/manifest_constants.h"
#include "extensions/common/permissions/api_permission_set.h"
+#include "extensions/common/permissions/permission_set.h"
#include "sync/api/sync_error.h"
#include "sync/api/sync_error_factory_mock.h"
#include "sync/protocol/sync.pb.h"