extensions: Move sockets manifest handler registration

It was being done as a one-off in app_shell and replicated in Chrome.
Moved it to RegisterCommonManifestHandlers() where it belongs.

BUG=none
TEST=extensions_unittests, unit_tests

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

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

chrome/common/extensions/chrome_manifest_handlers.cc

@@ -33,7 +33,6 @@
 #include "chrome/common/extensions/manifest_handlers/ui_overrides_handler.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "extensions/common/api/bluetooth/bluetooth_manifest_handler.h"
-#include "extensions/common/api/sockets/sockets_manifest_handler.h"
 #include "extensions/common/manifest_handlers/options_page_info.h"
 #include "extensions/common/manifest_handlers/requirements_info.h"
 
@@ -66,7 +65,6 @@ void RegisterChromeManifestHandlers() {
   (new PluginsHandler)->Register();
   (new RequirementsHandler)->Register();  // Depends on plugins.
   (new SettingsOverridesHandler)->Register();
-  (new SocketsManifestHandler)->Register();
   (new SpellcheckHandler)->Register();
   (new StorageSchemaManifestHandler)->Register();
   (new SupervisedUserHandler)->Register();

extensions/common/common_manifest_handlers.cc

@@ -4,6 +4,7 @@
 
 #include "extensions/common/common_manifest_handlers.h"
 
+#include "extensions/common/api/sockets/sockets_manifest_handler.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/csp_info.h"
@@ -40,6 +41,7 @@ void RegisterCommonManifestHandlers() {
   (new OfflineEnabledHandler)->Register();
   (new SandboxedPageHandler)->Register();
   (new SharedModuleHandler)->Register();
+  (new SocketsManifestHandler)->Register();
   (new WebAccessibleResourcesHandler)->Register();
   (new WebviewHandler)->Register();
 #endif  // defined(ENABLE_EXTENSIONS)

extensions/shell/common/shell_extensions_client.cc

@@ -7,7 +7,6 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "extensions/common/api/generated_schemas.h"
-#include "extensions/common/api/sockets/sockets_manifest_handler.h"
 #include "extensions/common/common_manifest_handlers.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/features/api_feature.h"
@@ -85,12 +84,6 @@ ShellExtensionsClient::~ShellExtensionsClient() {
 
 void ShellExtensionsClient::Initialize() {
   RegisterCommonManifestHandlers();
-
-  // TODO(rockot): API manifest handlers which move out to src/extensions
-  // should either end up in RegisterCommonManifestHandlers or some new
-  // initialization step specifically for API manifest handlers.
-  (new SocketsManifestHandler)->Register();
-
   ManifestHandler::FinalizeRegistration();
   // TODO(jamescook): Do we need to whitelist any extensions?