Rename chrome/android/javatests to javatests_shell.

chrome/android/javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java
deleted file mode 100644
index 8adfe6531df216132ff0b234d87b9dc86bec5d68..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2012 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;
-
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import org.chromium.base.test.util.AdvancedMockContext;
-import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.util.HashUtil;
-
-public class SettingsSecureBasedIdentificationGeneratorTest extends InstrumentationTestCase {
-
-    private static final String FLAG_ANDROID_ID = "android_id";
-
-    @SmallTest
-    @Feature({"ChromeToMobile", "Omaha"})
-    public void testAndroidIdSuccessWithSalt() {
-        String androidId = "42";
-        String salt = "mySalt";
-        String expected = HashUtil.getMd5Hash(new HashUtil.Params(androidId).withSalt(salt));
-        runTest(androidId, salt, expected);
-    }
-
-    @SmallTest
-    @Feature({"ChromeToMobile", "Omaha"})
-    public void testAndroidIdSuccessWithoutSalt() {
-        String androidId = "42";
-        String expected = HashUtil.getMd5Hash(new HashUtil.Params(androidId));
-        runTest(androidId, null, expected);
-    }
-
-    @SmallTest
-    @Feature({"ChromeToMobile", "Omaha"})
-    public void testAndroidIdFailureWithSalt() {
-        String androidId = null;
-        String salt = "mySalt";
-        String expected = "";
-        runTest(androidId, salt, expected);
-    }
-
-    @SmallTest
-    @Feature({"ChromeToMobile", "Omaha"})
-    public void testAndroidIdFailureWithoutSalt() {
-        String androidId = null;
-        String salt = null;
-        String expected = "";
-        runTest(androidId, salt, expected);
-    }
-
-    private void runTest(String androidId, String salt, String expectedUniqueId) {
-        AdvancedMockContext context = new AdvancedMockContext();
-        TestGenerator generator = new TestGenerator(context, androidId);
-
-        // Get a unique ID and ensure it is as expected.
-        String result = generator.getUniqueId(salt);
-        assertEquals(expectedUniqueId, result);
-    }
-
-    private static class TestGenerator extends SettingsSecureBasedIdentificationGenerator {
-        private final AdvancedMockContext mContext;
-        private final String mAndroidId;
-
-        TestGenerator(AdvancedMockContext context, String androidId) {
-            super(context);
-            mContext = context;
-            mAndroidId = androidId;
-        }
-
-        @Override
-        String getAndroidId() {
-            mContext.setFlag(FLAG_ANDROID_ID);
-            return mAndroidId;
-        }
-    }
-}