Commit d1e0d77c authored by yolandyan's avatar yolandyan Committed by Commit bot

Fix and add PrivacyPreferencesManagerNativeTest

This test has syntax error and is missed in gn build file when added.

Review-Url: https://codereview.chromium.org/2738983006
Cr-Commit-Position: refs/heads/master@{#456241}
parent 659edf80
...@@ -1462,6 +1462,7 @@ chrome_test_java_sources = [ ...@@ -1462,6 +1462,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java", "javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java",
"javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java", "javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java",
"javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java", "javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java",
"javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerNativeTest.java",
"javatests/src/org/chromium/chrome/browser/preferences/website/ManageSpaceActivityTest.java", "javatests/src/org/chromium/chrome/browser/preferences/website/ManageSpaceActivityTest.java",
"javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java", "javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java",
"javatests/src/org/chromium/chrome/browser/preferences/website/WebsiteAddressTest.java", "javatests/src/org/chromium/chrome/browser/preferences/website/WebsiteAddressTest.java",
......
...@@ -12,6 +12,7 @@ import android.test.UiThreadTest; ...@@ -12,6 +12,7 @@ import android.test.UiThreadTest;
import org.chromium.base.CommandLine; import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils; import org.chromium.base.ContextUtils;
import org.chromium.base.test.util.AdvancedMockContext; import org.chromium.base.test.util.AdvancedMockContext;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.preferences.PrefServiceBridge; import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.content.browser.test.NativeLibraryTestBase; import org.chromium.content.browser.test.NativeLibraryTestBase;
...@@ -29,7 +30,7 @@ public class PrivacyPreferencesManagerNativeTest extends NativeLibraryTestBase { ...@@ -29,7 +30,7 @@ public class PrivacyPreferencesManagerNativeTest extends NativeLibraryTestBase {
@SmallTest @SmallTest
@Feature({"Android-AppBase"}) @Feature({"Android-AppBase"})
@UiThreadTest @UiThreadTest
public void testSyncUsageAndCrashReporting { public void testSyncUsageAndCrashReporting() {
CommandLine.init(null); CommandLine.init(null);
PermissionContext context = new PermissionContext(getInstrumentation().getTargetContext()); PermissionContext context = new PermissionContext(getInstrumentation().getTargetContext());
PrefServiceBridge prefBridge = PrefServiceBridge.getInstance(); PrefServiceBridge prefBridge = PrefServiceBridge.getInstance();
...@@ -47,6 +48,7 @@ public class PrivacyPreferencesManagerNativeTest extends NativeLibraryTestBase { ...@@ -47,6 +48,7 @@ public class PrivacyPreferencesManagerNativeTest extends NativeLibraryTestBase {
@SmallTest @SmallTest
@Feature({"Android-AppBase"}) @Feature({"Android-AppBase"})
@UiThreadTest @UiThreadTest
@DisabledTest(message = "crbug.com/700500")
public void testSetUsageAndCrashReporting() { public void testSetUsageAndCrashReporting() {
CommandLine.init(null); CommandLine.init(null);
PermissionContext context = new PermissionContext(getInstrumentation().getTargetContext()); PermissionContext context = new PermissionContext(getInstrumentation().getTargetContext());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment