Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 2 insertions, 17 deletions

diff --git a/platform/platform-tests/testSrc/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafeTest.java b/platform/platform-tests/testSrc/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafeTest.java
index 0e2355f5c3c1..a84497a8f083 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafeTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafeTest.java
@@ -28,13 +28,13 @@ public class MasterKeyPasswordSafeTest {
   @Test
   public void testMasterKey() throws PasswordSafeException {
     PasswordDatabase db = new PasswordDatabase();
-    MasterKeyPasswordSafe s1 = testProvider(db);
+    MasterKeyPasswordSafe s1 = new MasterKeyPasswordSafe(db);
     s1.resetMasterPassword("pass1", false);
     s1.storePassword(null, MasterKeyPasswordSafeTest.class, "TEST", "test");
     assertEquals("test", s1.getPassword(null, MasterKeyPasswordSafeTest.class, "TEST"));
     assertTrue(s1.changeMasterPassword("pass1", "pass2", false));
     assertEquals("test", s1.getPassword(null, MasterKeyPasswordSafeTest.class, "TEST"));
-    MasterKeyPasswordSafe s2 = testProvider(db);
+    MasterKeyPasswordSafe s2 = new MasterKeyPasswordSafe(db);
     assertFalse(s2.setMasterPassword("pass1"));
     assertTrue(s2.setMasterPassword("pass2"));
     assertEquals("test", s2.getPassword(null, MasterKeyPasswordSafeTest.class, "TEST"));
@@ -45,19 +45,4 @@ public class MasterKeyPasswordSafeTest {
     s2.resetMasterPassword("fail", false);
     assertNull(s2.getPassword(null, MasterKeyPasswordSafeTest.class, "TEST"));
   }
-
-  /**
-   * Get test instance of the provider
-   * @param db the database to use
-   * @return a instance of the provider
-   */
-  private static MasterKeyPasswordSafe testProvider(final PasswordDatabase db) {
-    return new MasterKeyPasswordSafe(db) {
-      @Override
-      protected boolean isTestMode() {
-        return true;
-      }
-    };
-  }
-
 }