Moved permissions api out of chrome/browser/extensions
BUG=101244
TEST=no
Review URL: http://codereview.chromium.org/9188024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118514 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
similarity index 97%
rename from chrome/browser/extensions/extension_permissions_api.cc
rename to chrome/browser/extensions/api/permissions/permissions_api.cc
index fe92710..357b820 100644
--- a/chrome/browser/extensions/extension_permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/extension_permissions_api.h"
+#include "chrome/browser/extensions/api/permissions/permissions_api.h"
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
-#include "chrome/browser/extensions/extension_permissions_api_helpers.h"
+#include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/extension_permissions_api.h b/chrome/browser/extensions/api/permissions/permissions_api.h
similarity index 90%
rename from chrome/browser/extensions/extension_permissions_api.h
rename to chrome/browser/extensions/api/permissions/permissions_api.h
index effa7e97..c52140d8 100644
--- a/chrome/browser/extensions/extension_permissions_api.h
+++ b/chrome/browser/extensions/api/permissions/permissions_api.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_H__
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_H__
+#ifndef CHROME_BROWSER_EXTENSIONS_API_PERMISSIONS_PERMISSIONS_API_H_
+#define CHROME_BROWSER_EXTENSIONS_API_PERMISSIONS_PERMISSIONS_API_H_
#pragma once
#include <string>
@@ -62,4 +62,4 @@
DECLARE_EXTENSION_FUNCTION_NAME("permissions.request")
};
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_H__
+#endif // CHROME_BROWSER_EXTENSIONS_API_PERMISSIONS_PERMISSIONS_API_H_
diff --git a/chrome/browser/extensions/extension_permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
similarity index 97%
rename from chrome/browser/extensions/extension_permissions_api_helpers.cc
rename to chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
index a63909ba..7479770 100644
--- a/chrome/browser/extensions/extension_permissions_api_helpers.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/extension_permissions_api_helpers.h"
+#include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
#include "base/values.h"
#include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/extensions/extension_permissions_api_helpers.h b/chrome/browser/extensions/api/permissions/permissions_api_helpers.h
similarity index 78%
rename from chrome/browser/extensions/extension_permissions_api_helpers.h
rename to chrome/browser/extensions/api/permissions/permissions_api_helpers.h
index 563f99e6..e9e2255 100644
--- a/chrome/browser/extensions/extension_permissions_api_helpers.h
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_HELPERS_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_HELPERS_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_PERMISSIONS_PERMISSIONS_API_HELPERS_H_
+#define CHROME_BROWSER_EXTENSIONS_API_PERMISSIONS_PERMISSIONS_API_HELPERS_H_
#pragma once
#include <string>
@@ -33,4 +33,4 @@
} // namespace extensions
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_HELPERS_H__
+#endif // CHROME_BROWSER_EXTENSIONS_API_PERMISSIONS_PERMISSIONS_API_HELPERS_H_
diff --git a/chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
similarity index 98%
rename from chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc
rename to chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
index 939db3a..4e88b96 100644
--- a/chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
@@ -4,7 +4,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
-#include "chrome/browser/extensions/extension_permissions_api_helpers.h"
+#include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
#include "chrome/common/extensions/extension_permission_set.h"
#include "chrome/common/extensions/url_pattern_set.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/browser/extensions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc
similarity index 98%
rename from chrome/browser/extensions/permissions_apitest.cc
rename to chrome/browser/extensions/api/permissions/permissions_apitest.cc
index c000bf19..0560f0b0 100644
--- a/chrome/browser/extensions/permissions_apitest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc
@@ -2,8 +2,8 @@
// 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/permissions/permissions_api.h"
#include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_permissions_api.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 104264d..4a1c6426 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
#include "chrome/browser/download/download_extension_api.h"
#include "chrome/browser/extensions/api/dns/dns_api.h"
+#include "chrome/browser/extensions/api/permissions/permissions_api.h"
#include "chrome/browser/extensions/api/serial/serial_api.h"
#include "chrome/browser/extensions/api/socket/socket_api.h"
#include "chrome/browser/extensions/execute_code_in_tab_function.h"
@@ -38,7 +39,6 @@
#include "chrome/browser/extensions/extension_omnibox_api.h"
#include "chrome/browser/extensions/extension_page_actions_module.h"
#include "chrome/browser/extensions/extension_page_capture_api.h"
-#include "chrome/browser/extensions/extension_permissions_api.h"
#include "chrome/browser/extensions/extension_preference_api.h"
#include "chrome/browser/extensions/extension_processes_api.h"
#include "chrome/browser/extensions/extension_proxy_api.h"
diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc
index eb79b70..9fdc2a74 100644
--- a/chrome/browser/extensions/permissions_updater.cc
+++ b/chrome/browser/extensions/permissions_updater.cc
@@ -7,8 +7,8 @@
#include "base/json/json_writer.h"
#include "base/memory/ref_counted.h"
#include "base/values.h"
+#include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
#include "chrome/browser/extensions/extension_event_router.h"
-#include "chrome/browser/extensions/extension_permissions_api_helpers.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9800f9e..06c34ef 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -953,6 +953,10 @@
'browser/event_disposition.h',
'browser/extensions/api/dns/dns_api.cc',
'browser/extensions/api/dns/dns_api.h',
+ 'browser/extensions/api/permissions/permissions_api.cc',
+ 'browser/extensions/api/permissions/permissions_api.h',
+ 'browser/extensions/api/permissions/permissions_api_helpers.cc',
+ 'browser/extensions/api/permissions/permissions_api_helpers.h',
'browser/extensions/api/serial/serial_api.cc',
'browser/extensions/api/serial/serial_api.h',
'browser/extensions/api/socket/socket.cc',
@@ -1119,10 +1123,6 @@
'browser/extensions/extension_page_actions_module_constants.h',
'browser/extensions/extension_page_capture_api.cc',
'browser/extensions/extension_page_capture_api.h',
- 'browser/extensions/extension_permissions_api.cc',
- 'browser/extensions/extension_permissions_api.h',
- 'browser/extensions/extension_permissions_api_helpers.cc',
- 'browser/extensions/extension_permissions_api_helpers.h',
'browser/extensions/extension_pref_store.cc',
'browser/extensions/extension_pref_store.h',
'browser/extensions/extension_pref_value_map.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 59152d0..633a1b2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1411,6 +1411,7 @@
'browser/enumerate_modules_model_unittest_win.cc',
'browser/event_disposition.cc',
'browser/event_disposition.h',
+ 'browser/extensions/api/permissions/permissions_api_helpers_unittest.cc',
'browser/extensions/api/socket/socket_unittest.cc',
'browser/extensions/api/socket/socket_api_controller_unittest.cc',
'browser/extensions/api/socket/socket_event_notifier_unittest.cc',
@@ -1433,7 +1434,6 @@
'browser/extensions/extension_info_map_unittest.cc',
'browser/extensions/extension_menu_manager_unittest.cc',
'browser/extensions/extension_omnibox_unittest.cc',
- 'browser/extensions/extension_permissions_api_helpers_unittest.cc',
'browser/extensions/extension_pref_value_map_unittest.cc',
'browser/extensions/extension_prefs_unittest.cc',
'browser/extensions/extension_prefs_unittest.h',
@@ -2558,6 +2558,7 @@
'browser/extensions/alert_apitest.cc',
'browser/extensions/all_urls_apitest.cc',
'browser/extensions/api/dns/dns_apitest.cc',
+ 'browser/extensions/api/permissions/permissions_apitest.cc',
'browser/extensions/api/serial/serial_apitest.cc',
'browser/extensions/api/socket/socket_apitest.cc',
'browser/extensions/api/socket/test_echo_server_udp.cc',
@@ -2653,7 +2654,6 @@
'browser/extensions/lazy_background_page_apitest.cc',
'browser/extensions/notifications_apitest.cc',
'browser/extensions/page_action_apitest.cc',
- 'browser/extensions/permissions_apitest.cc',
'browser/extensions/platform_app_browsertest.cc',
'browser/extensions/settings/settings_apitest.cc',
'browser/extensions/stubs_apitest.cc',
