Rename chrome/android/javatests to javatests_shell.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java
deleted file mode 100644
index dca9c535175420e37223ee0df33a92b2e07706dc..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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;
-
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import junit.framework.Assert;
-
-import org.chromium.base.test.util.AdvancedMockContext;
-import org.chromium.base.test.util.Feature;
-
-public class UuidBasedUniqueIdentificationGeneratorTest extends InstrumentationTestCase {
-    private static final String FLAG_UUID = "uuid";
-
-    private AdvancedMockContext mContext;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = new AdvancedMockContext(getInstrumentation().getTargetContext());
-    }
-
-    @SmallTest
-    @Feature({"Sync"})
-    public void testGenerationAndRestorationOfUuid() {
-        String preferenceKey = "some_preference_key";
-        String expectedUniqueId = "myUuid";
-        TestGenerator generator = new TestGenerator(mContext, preferenceKey, expectedUniqueId);
-
-        // Get a unique ID and ensure it is as expected.
-        Assert.assertEquals(expectedUniqueId, generator.getUniqueId(null));
-
-        // Asking for a unique ID again, should not try to regenerate it.
-        mContext.clearFlag(FLAG_UUID);
-        Assert.assertEquals(expectedUniqueId, generator.getUniqueId(null));
-        assertFalse(mContext.isFlagSet(FLAG_UUID));
-
-        // After a restart, the TestGenerator should read the UUID from a preference, instead of
-        // asking for it.
-        mContext.clearFlag(FLAG_UUID);
-        generator = new TestGenerator(mContext, preferenceKey, null);
-        Assert.assertEquals(expectedUniqueId, generator.getUniqueId(null));
-        assertFalse(mContext.isFlagSet(FLAG_UUID));
-    }
-
-    @SmallTest
-    @Feature({"Sync"})
-    public void testTwoDifferentGeneratorsShouldUseDifferentPreferences() {
-        String preferenceKey1 = "some_preference_key";
-        String preferenceKey2 = "some_other_preference_key";
-        String expectedUniqueId1 = "myUuid";
-        String expectedUniqueId2 = "myOtherUuid";
-        TestGenerator generator1 = new TestGenerator(mContext, preferenceKey1, expectedUniqueId1);
-        TestGenerator generator2 = new TestGenerator(mContext, preferenceKey2, expectedUniqueId2);
-
-        // Get a unique ID and ensure it is as expected.
-        Assert.assertEquals(expectedUniqueId1, generator1.getUniqueId(null));
-        Assert.assertEquals(expectedUniqueId2, generator2.getUniqueId(null));
-
-        // Asking for a unique ID again, should not try to regenerate it.
-        mContext.clearFlag(FLAG_UUID);
-        Assert.assertEquals(expectedUniqueId1, generator1.getUniqueId(null));
-        assertFalse(mContext.isFlagSet(FLAG_UUID));
-        mContext.clearFlag(FLAG_UUID);
-        Assert.assertEquals(expectedUniqueId2, generator2.getUniqueId(null));
-        assertFalse(mContext.isFlagSet(FLAG_UUID));
-    }
-
-    private static class TestGenerator extends UuidBasedUniqueIdentificationGenerator {
-        private final AdvancedMockContext mContext;
-        private final String mUuid;
-
-        TestGenerator(AdvancedMockContext context, String preferenceKey, String uuid) {
-            super(context, preferenceKey);
-            mContext = context;
-            mUuid = uuid;
-        }
-
-        @Override
-        String getUUID() {
-            mContext.setFlag(FLAG_UUID);
-            return mUuid;
-        }
-    }
-}