2 files changed, 2 insertions, 8 deletions
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 26a9d5a..701fa69 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -34,7 +34,6 @@ class RenderFrameHost;
 class RenderWidgetHostViewAndroid;
 struct MenuItem;
 
-// TODO(jrg): this is a shell.  Upstream the rest.
 class ContentViewCoreImpl : public ContentViewCore,
                             public WebContentsObserver {
  public:
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 962400d..1616b71 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -583,11 +583,6 @@ public class ContentViewCore
         return mWebContents;
     }
 
-    /* TODO(aelias): Remove this after downstream callers switch to setTopControlsHeight. */
-    public void setViewportSizeOffset(int offsetXPix, int offsetYPix) {
-        setTopControlsHeight(mTopControlsHeightPix, offsetYPix != 0);
-    }
-
     /**
      *
      * @param topControlsHeightPix       The height of the top controls in pixels.
@@ -653,7 +648,7 @@ public class ContentViewCore
         return mViewAndroid;
     }
 
-    private ImeAdapter createImeAdapter(Context context) {
+    private ImeAdapter createImeAdapter() {
         return new ImeAdapter(mInputMethodManagerWrapper,
                 new ImeAdapter.ImeAdapterDelegate() {
                     @Override
@@ -746,7 +741,7 @@ public class ContentViewCore
         setContainerViewInternals(internalDispatcher);
         mRenderCoordinates.reset();
         initPopupZoomer(mContext);
-        mImeAdapter = createImeAdapter(mContext);
+        mImeAdapter = createImeAdapter();
         attachImeAdapter();
 
         mAccessibilityInjector = AccessibilityInjector.newInstance(this);