Modularize Omaha on Android: cleaned up leftover identity/ code

Bug: 1131415
Change-Id: If45bd8a0f722428b031396423a74d256671346e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463577
Auto-Submit: Andrey Zaytsev <andzaytsev@google.com>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816576}

chrome/android/chrome_java_sources.gni

@@ -799,8 +799,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/homepage/settings/HomepageMetricsEnums.java",
   "java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java",
   "java/src/org/chromium/chrome/browser/homepage/settings/RadioButtonGroupHomepagePreference.java",
-  "java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGenerator.java",
-  "java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactory.java",
   "java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java",
   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java",
   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationPresenceController.java",

chrome/android/java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGenerator.java

-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.identity;
-
-/**
- * Interface used for uniquely identifying an installation of Chrome. To get an instance you should
- * use {@link UniqueIdentificationGeneratorFactory}.
- */
-public interface UniqueIdentificationGenerator
-        extends org.chromium.chrome.browser.uid.UniqueIdentificationGenerator {}

chrome/android/java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactory.java

-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.identity;
-
-/**
- * Factory for setting and retrieving instances of {@link UniqueIdentificationGenerator}s.
- * <p/>
- * A generator must always be set for a generator type before it is asked for. A generator type
- * is any string you want to use for your generator. It is typically defined as a public static
- * field in the generator itself.
- */
-public final class UniqueIdentificationGeneratorFactory {
-
-    /**
-     * During startup of the application, and before any calls to
-     * {@link #getInstance(String)} you must add all supported generators
-     * to this factory.
-     *
-     * @param generatorType the type of generator this is. Must be a unique string.
-     * @param gen           the generator.
-     * @param force         if set to true, will override any existing generator for this type. Else
-     *                      discards calls where a generator exists.
-     */
-    public static void registerGenerator(String generatorType, UniqueIdentificationGenerator gen,
-                                         boolean force) {
-        // TODO(crbug.com/1131415): remove this file after the downstream is updated.
-        org.chromium.chrome.browser.uid.UniqueIdentificationGeneratorFactory.registerGenerator(
-                generatorType, gen, force);
-    }
-}