Add ContextMenu support upstream for Android

chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/TabShellTabUtils.java

Index: chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/TabShellTabUtils.java
diff --git a/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/TabShellTabUtils.java b/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/TabShellTabUtils.java
deleted file mode 100644
index 35d5df0620e9893f7a837d73172a21c7f663283b..0000000000000000000000000000000000000000
--- a/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/TabShellTabUtils.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.testshell;
-
-import org.chromium.chrome.browser.EmptyTabObserver;
-import org.chromium.chrome.browser.TabBase;
-import org.chromium.content.browser.ContentViewClient;
-import org.chromium.content.browser.test.util.CallbackHelper;
-import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
-import org.chromium.content.browser.test.util.TestContentViewClient;
-import org.chromium.content.browser.test.util.TestContentViewClientWrapper;
-import org.chromium.content.browser.test.util.TestWebContentsObserver;
-
-/**
- * A utility class that contains methods generic to all Tabs tests.
- */
-public class TabShellTabUtils {
-    private static TestContentViewClient createTestContentViewClientForTab(TestShellTab tab) {
-        ContentViewClient client = tab.getContentView().getContentViewClient();
-        if (client instanceof TestContentViewClient) return (TestContentViewClient) client;
-
-        TestContentViewClient testClient = new TestContentViewClientWrapper(client);
-        tab.getContentView().setContentViewClient(testClient);
-        return testClient;
-    }
-
-    public static class TestCallbackHelperContainerForTab extends TestCallbackHelperContainer {
-        private final OnCloseTabHelper mOnCloseTabHelper;
-        public TestCallbackHelperContainerForTab(TestShellTab tab) {
-            super(createTestContentViewClientForTab(tab),
-                    new TestWebContentsObserver(tab.getContentView().getContentViewCore()));
-            mOnCloseTabHelper = new OnCloseTabHelper();
-            tab.addObserver(new EmptyTabObserver() {
-                @Override
-                public void onDestroyed(TabBase tab) {
-                    mOnCloseTabHelper.notifyCalled();
-                }
-            });
-        }
-
-        public static class OnCloseTabHelper extends CallbackHelper {
-        }
-
-        public OnCloseTabHelper getOnCloseTabHelper() {
-            return mOnCloseTabHelper;
-        }
-    }
-
-    /**
-     * Creates, binds and returns a TestCallbackHelperContainer for a given Tab.
-     */
-    public static TestCallbackHelperContainerForTab getTestCallbackHelperContainer(
-            final TestShellTab tab) {
-        return tab == null ? null : new TestCallbackHelperContainerForTab(tab);
-    }
-}