Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(751)

Unified Diff: components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java

Issue 2337983004: [AndroidWebView] Add instrumentation test to catch StrictMode violations (Closed)
Patch Set: Minor changes - class renaming + comment removal. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/policy/android/java/src/org/chromium/policy/AbstractAppRestrictionsProvider.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java
diff --git a/components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java b/components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java
index 11b7be2da65f77bd8c0f8a24b43e222162aba313..7af5bdc843cb14fa3a33525ddf703130aedbe927 100644
--- a/components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java
+++ b/components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java
@@ -134,8 +134,13 @@ public final class Policies {
public static class RegistrationHook implements PreTestHook {
@Override
public void run(Context targetContext, Method testMethod) {
- final Bundle policyBundle = PolicyData.asBundle(getPolicies(testMethod).values());
- AbstractAppRestrictionsProvider.setTestRestrictions(policyBundle);
+ Map<String, PolicyData> policyMap = getPolicies(testMethod);
+ if (policyMap.isEmpty()) {
+ AbstractAppRestrictionsProvider.setTestRestrictions(null);
+ } else {
+ final Bundle policyBundle = PolicyData.asBundle(policyMap.values());
+ AbstractAppRestrictionsProvider.setTestRestrictions(policyBundle);
+ }
}
}
}
« no previous file with comments | « components/policy/android/java/src/org/chromium/policy/AbstractAppRestrictionsProvider.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698