| Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
|
| index 7e693a000d424c46a3cd52f677b1e5941f3b2bf0..d0058040a92c43efbe2930ac39e76b8f9058afdb 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
|
| @@ -290,7 +290,8 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro
|
| }
|
|
|
| private void setEnableKeygen(final String origin, final boolean enabled) {
|
| - Website website = new Website(WebsiteAddress.create(origin));
|
| + WebsiteAddress address = WebsiteAddress.create(origin);
|
| + Website website = new Website(address, address);
|
| website.setKeygenInfo(new KeygenInfo(origin, origin, false));
|
| final Preferences preferenceActivity = startSingleWebsitePreferences(website);
|
|
|
| @@ -438,7 +439,8 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro
|
| ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| @Override
|
| public void run() {
|
| - Website site = new Website(WebsiteAddress.create(origin));
|
| + WebsiteAddress address = WebsiteAddress.create(origin);
|
| + Website site = new Website(address, address);
|
| site.setKeygenInfo(new KeygenInfo(origin, origin, false));
|
| assertEquals(site.getKeygenPermission(), ContentSetting.BLOCK);
|
| }
|
| @@ -458,7 +460,8 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro
|
| ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| @Override
|
| public void run() {
|
| - Website site = new Website(WebsiteAddress.create(origin));
|
| + WebsiteAddress address = WebsiteAddress.create(origin);
|
| + Website site = new Website(address, address);
|
| site.setKeygenInfo(new KeygenInfo(origin, origin, false));
|
| assertEquals(site.getKeygenPermission(), ContentSetting.ALLOW);
|
| }
|
| @@ -515,7 +518,8 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro
|
| @SmallTest
|
| @Feature({"Preferences"})
|
| public void testResetCrash600232() throws Exception {
|
| - Website website = new Website(WebsiteAddress.create("example.com"));
|
| + WebsiteAddress address = WebsiteAddress.create("example.com");
|
| + Website website = new Website(address, address);
|
| final Preferences preferenceActivity = startSingleWebsitePreferences(website);
|
|
|
| ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
|
|