Index: content/public/android/java/src/org/chromium/content/browser/ContentClassFactory.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentClassFactory.java b/content/public/android/java/src/org/chromium/content/browser/ContentClassFactory.java |
index ba2a78d798f194d63249ab170569a840a0b3d15d..f1ede8d00cd7bf0dc9462463fe12c9af0222fc02 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/ContentClassFactory.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentClassFactory.java |
@@ -4,7 +4,6 @@ |
package org.chromium.content.browser; |
-import org.chromium.base.ThreadUtils; |
import org.chromium.ui.base.WindowAndroid; |
/** |
@@ -16,18 +15,14 @@ public class ContentClassFactory { |
/** |
* Sets the factory object. |
*/ |
- public static void set(ContentClassFactory factory) { |
- ThreadUtils.assertOnUiThread(); |
- |
+ public static synchronized void set(ContentClassFactory factory) { |
Tima Vaisburd
2017/03/27 18:19:46
Some tests are failing because their setUp() metho
boliu
2017/03/27 18:21:55
fix the tests
Tima Vaisburd
2017/03/28 03:02:14
Used ThreadUtils.runOnUiThreadBlocking() which I o
|
sSingleton = factory; |
} |
/** |
* Returns the factory object. |
*/ |
- public static ContentClassFactory get() { |
- ThreadUtils.assertOnUiThread(); |
- |
+ public static synchronized ContentClassFactory get() { |
if (sSingleton == null) sSingleton = new ContentClassFactory(); |
return sSingleton; |
} |