android: revise MockContextForLayout to support getUserId calls.

Bug: 1022537
Change-Id: Ic0181f537b130c869c05be2a7ba1e7584e6ba0a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904493
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713823}

chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockContextForLayout.java

@@ -5,11 +5,8 @@
 package org.chromium.chrome.browser.compositor.layouts;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
+import android.content.ContextWrapper;
 import android.content.res.Resources;
-import android.os.Looper;
-import android.test.mock.MockContext;
 import android.test.mock.MockResources;
 
 /**
@@ -17,13 +14,12 @@ import android.test.mock.MockResources;
  * It points to a {@link MockResources} for anything that is based on xml configurations. For
  * everything else the standard provided Context should be sufficient.
  */
-public class MockContextForLayout extends MockContext {
-    private final Context mValidContext;
+public class MockContextForLayout extends ContextWrapper {
     private final MockResourcesForLayout mResources;
     private final Resources.Theme mTheme;
 
     public MockContextForLayout(Context validContext) {
-        mValidContext = validContext;
+        super(validContext);
         mResources = new MockResourcesForLayout(validContext.getResources());
         mTheme = mResources.newTheme();
     }
@@ -33,38 +29,13 @@ public class MockContextForLayout extends MockContext {
         return mResources;
     }
 
-    @Override
-    public ApplicationInfo getApplicationInfo() {
-        return mValidContext.getApplicationInfo();
-    }
-
-    @Override
-    public Object getSystemService(String name) {
-        return mValidContext.getSystemService(name);
-    }
-
-    @Override
-    public PackageManager getPackageManager() {
-        return mValidContext.getPackageManager();
-    }
-
     @Override
     public Context getApplicationContext() {
         return this;
     }
 
-    @Override
-    public int checkCallingOrSelfPermission(String permission) {
-        return mValidContext.checkCallingOrSelfPermission(permission);
-    }
-
-    @Override
-    public Looper getMainLooper() {
-        return mValidContext.getMainLooper();
-    }
-
     @Override
     public Resources.Theme getTheme() {
         return mTheme;
     }
-}
+}
\ No newline at end of file