Smart Lock: Remove unused Chrome app manifest.

R=hansberry@chromium.org

Bug: 899324
Test: none
Change-Id: I08eff200cd6d8eb2eaad989d0abcab7fc1f3d53f
Reviewed-on: https://chromium-review.googlesource.com/c/1321030Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606563}

chrome/browser/browser_resources.grd

@@ -618,8 +618,6 @@
         <include name="IDR_DEVICE_EMULATOR_PAGES_JS" file="resources\chromeos\emulator\device_emulator_pages.js" type="BINDATA" />
         <include name="IDR_DEVICE_EMULATOR_SHARED_STYLES_HTML" file="resources\chromeos\emulator\shared_styles.html" type="BINDATA" />
       </if>
-      <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manifest.json" type="BINDATA" />
-      <include name="IDR_EASY_UNLOCK_MANIFEST_SIGNIN" file="resources\easy_unlock\manifest_signin.json" type="BINDATA" />
       <if expr="chromeos">
         <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html" type="BINDATA" />
         <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" />

chrome/browser/chromeos/login/easy_unlock/easy_unlock_service_factory.cc

@@ -19,7 +19,6 @@
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/grit/browser_resources.h"
 #include "chromeos/services/multidevice_setup/public/cpp/prefs.h"
 #include "chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -87,7 +86,6 @@ EasyUnlockServiceFactory::~EasyUnlockServiceFactory() {}
 KeyedService* EasyUnlockServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   EasyUnlockService* service = NULL;
-  int manifest_id = 0;
 
   if (!IsFeatureAllowed(context))
     return nullptr;
@@ -105,7 +103,6 @@ KeyedService* EasyUnlockServiceFactory::BuildServiceInstanceFor(
         Profile::FromBrowserContext(context),
         secure_channel::SecureChannelClientProvider::GetInstance()
             ->GetClient());
-    manifest_id = IDR_EASY_UNLOCK_MANIFEST_SIGNIN;
   }
 
   if (!service) {
@@ -116,7 +113,6 @@ KeyedService* EasyUnlockServiceFactory::BuildServiceInstanceFor(
             Profile::FromBrowserContext(context)),
         multidevice_setup::MultiDeviceSetupClientFactory::GetForProfile(
             Profile::FromBrowserContext(context)));
-    manifest_id = IDR_EASY_UNLOCK_MANIFEST;
   }
 
   const base::FilePath app_path = app_path_for_testing_.empty()

chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

@@ -86,8 +86,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
     case IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST:
     case IDR_CROSH_BUILTIN_MANIFEST:
     case IDR_DEMO_APP_MANIFEST:
-    case IDR_EASY_UNLOCK_MANIFEST:
-    case IDR_EASY_UNLOCK_MANIFEST_SIGNIN:
     case IDR_ECHO_MANIFEST:
     case IDR_FILEMANAGER_MANIFEST:
     case IDR_FIRST_RUN_DIALOG_MANIFEST:

chrome/browser/resources/easy_unlock/OWNERS

-hansberry@chromium.org
-jhawkins@chromium.org
-
-# COMPONENT: UI>ProximityAuth

chrome/browser/resources/easy_unlock/manifest.json

-{
-  "name": "Smart Lock",
-  "description": "This app allows you to unlock your device when in proximity to your phone.",
-  "version": "1.0",
-  "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqOUeUl1nC6qTz6WwVUIaAJ4ukXVzgeCAumX4TZlCHFk5DLHImHLDBxakyVGaQFLS9iEQ3tDTsJLIoA+FkbWKNX7bvDW/qM89CeVNZsIZRGw898m8J78N6dJHwP9aZSI8CpoMK2KvjANpuj1tdWs1OM6v65zRUu6y4Mq876dr5AcPiuznGxl8jekagBwGu8jqMySsJxLazj/EfQ3W1E7mpyHd0Z4C1qNwJoFlUQeMjn6gfPZqa06BLU6YznzCUesiyjFK3d1vzbN54ZkVxhcA6ekwLKYLqKykBFLmIQG0gkNNePzcGXju8p34dGJgkcZw0sOXrtNaLSe1su0zfcniIwIDAQAB",
-
-  "oauth2": {
-    "client_id": "383927464186-v05g3e5emhrrblqmpnvq7666jktlpc7q.apps.googleusercontent.com",
-    "auto_approve": true,
-    "scopes": [
-       "https://www.googleapis.com/auth/proximity_auth",
-       "https://www.googleapis.com/auth/cryptauth"
-    ]
-  },
-
-  "permissions": [
-    // Public APIs:
-    "alarms",
-    "browser",
-    "gcm",
-    "identity",
-    "notifications",
-    "storage",
-    "system.display",
-
-    // Private APIs:
-    "bluetoothPrivate",
-    "chromeosInfoPrivate",
-    "easyUnlockPrivate",
-    "feedbackPrivate",
-    "metricsPrivate",
-    "preferencesPrivate",
-    "screenlockPrivate",
-    "systemPrivate"
-  ],
-
-  "app": {
-    "background": {
-      "scripts": ["easy_unlock_background.js"]
-    }
-  },
-
-  "bluetooth": {
-    "socket" : true,
-    "low_energy" : true,
-    "uuids": [
-      "704EE561-3782-405A-A14B-2D47A2DDCDDF",  // Unlock UUID
-      "29422880-D56D-11E3-9C1A-0800200C9A66"   // Setup UUID
-    ]
-  },
-
-  "offline_enabled": true,
-
-  "display_in_launcher": false,
-
-  "icons": {
-    "32": "icons/easyunlock_app_icon_32.png",
-    "48": "icons/easyunlock_app_icon_48.png",
-    "64": "icons/easyunlock_app_icon_64.png",
-    "96": "icons/easyunlock_app_icon_96.png",
-    "128": "icons/easyunlock_app_icon_128.png",
-    "256": "icons/easyunlock_app_icon_256.png"
-  }
-}

chrome/browser/resources/easy_unlock/manifest_signin.json

-{
-  "name": "Smart Lock",
-  "description": "This app allows you to sign-in to a device when in proximity to your phone.",
-  "version": "1.1",
-  "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqOUeUl1nC6qTz6WwVUIaAJ4ukXVzgeCAumX4TZlCHFk5DLHImHLDBxakyVGaQFLS9iEQ3tDTsJLIoA+FkbWKNX7bvDW/qM89CeVNZsIZRGw898m8J78N6dJHwP9aZSI8CpoMK2KvjANpuj1tdWs1OM6v65zRUu6y4Mq876dr5AcPiuznGxl8jekagBwGu8jqMySsJxLazj/EfQ3W1E7mpyHd0Z4C1qNwJoFlUQeMjn6gfPZqa06BLU6YznzCUesiyjFK3d1vzbN54ZkVxhcA6ekwLKYLqKykBFLmIQG0gkNNePzcGXju8p34dGJgkcZw0sOXrtNaLSe1su0zfcniIwIDAQAB",
-
-  "permissions": [
-    // Public APIs:
-    "alarms",
-    "browser",
-    "gcm",
-    "identity",
-    "notifications",
-    "storage",
-    "system.display",
-
-    // Private APIs:
-    "bluetoothPrivate",
-    "chromeosInfoPrivate",
-    "easyUnlockPrivate",
-    "feedbackPrivate",
-    "metricsPrivate",
-    "preferencesPrivate",
-    "screenlockPrivate",
-    "systemPrivate"
-  ],
-
-  "app": {
-    "background": {
-      "scripts": ["easy_unlock_background.js"]
-    }
-  },
-
-  "bluetooth": {
-    "socket" : true,
-    "low_energy" : true,
-    "uuids": [
-      "704EE561-3782-405A-A14B-2D47A2DDCDDF"  // Unlock UUID
-    ]
-  },
-
-  "offline_enabled": true,
-
-  "display_in_launcher": false,
-
-  "incognito": "split",
-
-  "icons": {
-    "32": "icons/easyunlock_app_icon_32.png",
-    "48": "icons/easyunlock_app_icon_48.png",
-    "64": "icons/easyunlock_app_icon_64.png",
-    "96": "icons/easyunlock_app_icon_96.png",
-    "128": "icons/easyunlock_app_icon_128.png",
-    "256": "icons/easyunlock_app_icon_256.png"
-  }
-}