Move suggest_permission_util.cc to extensions

BUG=403276
R=benwells@chromium.org
TBR=sky@chromium.org for include fix under geolocation_permission_context_extensions.cc and protected_media_identifier_permission_context.cc

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

Cr-Commit-Position: refs/heads/master@{#290510}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290510 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 22 insertions, 22 deletions

diff --git a/apps/DEPS b/apps/DEPS
index 08e8448..eac406d 100644
--- a/apps/DEPS
+++ b/apps/DEPS
@@ -33,7 +33,6 @@ include_rules = [
   "+chrome/browser/extensions/api/file_handlers/mime_util.h",
   "+chrome/browser/extensions/api/file_system/file_system_api.h",
   "+chrome/browser/extensions/chrome_extension_web_contents_observer.h",
-  "+chrome/browser/extensions/suggest_permission_util.h",
   "+chrome/browser/extensions/unpacked_installer.h",
   "+chrome/common/extensions/api/app_window.h",
 ]
diff --git a/apps/app_web_contents_helper.cc b/apps/app_web_contents_helper.cc
index 115a372..7c7b293 100644
--- a/apps/app_web_contents_helper.cc
+++ b/apps/app_web_contents_helper.cc
@@ -6,12 +6,12 @@
 
 #include "apps/app_delegate.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/extensions/suggest_permission_util.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/suggest_permission_util.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/permissions/api_permission.h"
 
diff --git a/apps/app_window.cc b/apps/app_window.cc
index 3f7aa84..4b296ee 100644
--- a/apps/app_window.cc
+++ b/apps/app_window.cc
@@ -21,7 +21,6 @@
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
-#include "chrome/browser/extensions/suggest_permission_util.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/invalidate_type.h"
@@ -41,6 +40,7 @@
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/process_manager.h"
+#include "extensions/browser/suggest_permission_util.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/draggable_region.h"
 #include "extensions/common/extension.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 2b22962..61fd309 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -221,13 +221,13 @@
 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
-#include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
 #include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "chrome/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/browser/guest_view/guest_view_base.h"
 #include "extensions/browser/guest_view/guest_view_constants.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
+#include "extensions/browser/suggest_permission_util.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #endif
 
diff --git a/chrome/browser/geolocation/geolocation_permission_context_extensions.cc b/chrome/browser/geolocation/geolocation_permission_context_extensions.cc
index 04873f9..765e516 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_extensions.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_extensions.cc
@@ -8,11 +8,11 @@
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/content_settings/permission_request_id.h"
-#include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/process_map.h"
+#include "extensions/browser/suggest_permission_util.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/extension.h"
 
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index 3083c9d..fc228ea 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -24,8 +24,8 @@
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/suggest_permission_util.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/suggest_permission_util.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/extension.h"
 
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 0606a32e..de1b91f 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -852,8 +852,6 @@
       'browser/extensions/startup_helper.h',
       'browser/extensions/state_store_notification_observer.cc',
       'browser/extensions/state_store_notification_observer.h',
-      'browser/extensions/suggest_permission_util.cc',
-      'browser/extensions/suggest_permission_util.h',
       'browser/extensions/suspicious_extension_bubble_controller.cc',
       'browser/extensions/suspicious_extension_bubble_controller.h',
       'browser/extensions/sync_bundle.h',
diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
index 60aebeb..b6e6c5e 100644
--- a/extensions/browser/BUILD.gn
+++ b/extensions/browser/BUILD.gn
@@ -243,6 +243,8 @@ source_set("browser") {
       "script_executor.h",
       "state_store.cc",
       "state_store.h",
+      "suggest_permission_util.cc",
+      "suggest_permission_util.h",
       "uninstall_reason.h",
       "update_observer.h",
       "value_store/leveldb_value_store.cc",
diff --git a/chrome/browser/extensions/suggest_permission_util.cc b/extensions/browser/suggest_permission_util.cc
index 66a0f6a..85bf4ff 100644
--- a/chrome/browser/extensions/suggest_permission_util.cc
+++ b/extensions/browser/suggest_permission_util.cc
@@ -2,13 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/suggest_permission_util.h"
+#include "extensions/browser/suggest_permission_util.h"
 
-#include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/console_message_level.h"
-#include "extensions/browser/extension_system.h"
-#include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/permissions/permissions_data.h"
@@ -17,13 +14,15 @@
 using content::CONSOLE_MESSAGE_LEVEL_WARNING;
 using content::RenderViewHost;
 
+namespace extensions {
+
+namespace {
+
 const char kPermissionsHelpURLForExtensions[] =
     "http://developer.chrome.com/extensions/manifest.html#permissions";
 const char kPermissionsHelpURLForApps[] =
     "http://developer.chrome.com/apps/declare_permissions.html";
 
-namespace extensions {
-
 void SuggestAPIPermissionInDevToolsConsole(APIPermission::ID permission,
                                            const Extension* extension,
                                            content::RenderViewHost* host) {
@@ -46,6 +45,8 @@ void SuggestAPIPermissionInDevToolsConsole(APIPermission::ID permission,
       host->GetRoutingID(), CONSOLE_MESSAGE_LEVEL_WARNING, message));
 }
 
+}  // namespace
+
 bool IsExtensionWithPermissionOrSuggestInConsole(
     APIPermission::ID permission,
     const Extension* extension,
@@ -59,4 +60,4 @@ bool IsExtensionWithPermissionOrSuggestInConsole(
   return false;
 }
 
-} // namespace extensions
+}  // namespace extensions
diff --git a/chrome/browser/extensions/suggest_permission_util.h b/extensions/browser/suggest_permission_util.h
index 6e00571..a10c345 100644
--- a/chrome/browser/extensions/suggest_permission_util.h
+++ b/extensions/browser/suggest_permission_util.h
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_SUGGEST_PERMISSION_UTIL_H_
-#define CHROME_BROWSER_EXTENSIONS_SUGGEST_PERMISSION_UTIL_H_
+#ifndef EXTENSIONS_BROWSER_SUGGEST_PERMISSION_UTIL_H_
+#define EXTENSIONS_BROWSER_SUGGEST_PERMISSION_UTIL_H_
 
 #include "extensions/common/permissions/api_permission.h"
 
-class Profile;
-
 namespace content {
 class RenderViewHost;
 }
@@ -17,8 +15,8 @@ namespace extensions {
 
 class Extension;
 
-// Checks that |extension| is not NULL and that it has |permission|. If not
-// and extension, just returns false. If an extension without |permission|
+// Checks that |extension| is not NULL and that it has |permission|. If
+// |extension| is NULL, just returns false. If an extension without |permission|
 // returns false and suggests |permision| in the developer tools console.
 bool IsExtensionWithPermissionOrSuggestInConsole(
     APIPermission::ID permission,
@@ -27,4 +25,4 @@ bool IsExtensionWithPermissionOrSuggestInConsole(
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_SUGGEST_PERMISSION_UTIL_H_
+#endif  // EXTENSIONS_BROWSER_SUGGEST_PERMISSION_UTIL_H_
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 776baf9..64a1f3f 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -504,6 +504,8 @@
         'browser/script_executor.h',
         'browser/state_store.cc',
         'browser/state_store.h',
+        'browser/suggest_permission_util.cc',
+        'browser/suggest_permission_util.h',
         'browser/uninstall_reason.h',
         'browser/update_observer.h',
         'browser/value_store/leveldb_value_store.cc',