Remove "Search by Image" feature on Chrome for Android.

BUG=483685

Review URL: https://codereview.chromium.org/1394343002

Cr-Commit-Position: refs/heads/master@{#353447}

11 files changed, 0 insertions, 88 deletions

diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py
index cbc475e..c23edf6 100644
--- a/build/android/pylib/constants/__init__.py
+++ b/build/android/pylib/constants/__init__.py
@@ -135,7 +135,6 @@ LIGHTTPD_DEFAULT_PORT = 9000
 LIGHTTPD_RANDOM_PORT_FIRST = 8001
 LIGHTTPD_RANDOM_PORT_LAST = 8999
 TEST_SYNC_SERVER_PORT = 9031
-TEST_SEARCH_BY_IMAGE_SERVER_PORT = 9041
 TEST_POLICY_SERVER_PORT = 9051
 
 
diff --git a/chrome/android/java/res/menu/chrome_context_menu.xml b/chrome/android/java/res/menu/chrome_context_menu.xml
index 335e371..4306864 100644
--- a/chrome/android/java/res/menu/chrome_context_menu.xml
+++ b/chrome/android/java/res/menu/chrome_context_menu.xml
@@ -32,10 +32,6 @@
             android:title="@string/contextmenu_open_image_in_new_tab"/>
         <item android:id="@+id/contextmenu_open_original_image_in_new_tab"
             android:title="@string/contextmenu_open_original_image_in_new_tab"/>
-        <!-- Title is set in Java. Suppress lint warning about missing title. -->
-        <item xmlns:tools="http://schemas.android.com/tools"
-            android:id="@+id/contextmenu_search_by_image"
-            tools:ignore="MenuTitle" />
         <item android:id="@+id/contextmenu_copy_image"
             android:title="@string/contextmenu_copy_image"/>
         <item android:id="@+id/contextmenu_copy_image_url"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItemDelegate.java
index 69143b1..82eb312 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItemDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItemDelegate.java
@@ -98,11 +98,6 @@ public interface ChromeContextMenuItemDelegate {
      */
     void onSaveImageToClipboard(String url);
 
-    /**
-     * Called when a search by image should be performed in a new tab.
-     */
-    void onSearchByImageInNewTab();
-
    /**
     * @return page url.
     */
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
index 46b89f8..38de74c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
@@ -15,7 +15,6 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.UrlUtilities;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
-import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 
 /**
  * A {@link ContextMenuPopulator} used for showing the default Chrome context menu.
@@ -38,7 +37,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
         static final int ACTION_OPEN_IMAGE_IN_NEW_TAB = 8;
         static final int ACTION_COPY_IMAGE = 9;
         static final int ACTION_COPY_IMAGE_URL = 10;
-        static final int ACTION_SEARCH_BY_IMAGE = 11;
         static final int ACTION_LOAD_IMAGES = 12;
         static final int ACTION_LOAD_ORIGINAL_IMAGE = 13;
         static final int ACTION_SAVE_VIDEO = 14;
@@ -139,7 +137,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             menu.findItem(R.id.contextmenu_save_image).setVisible(false);
             menu.findItem(R.id.contextmenu_open_image).setVisible(false);
             menu.findItem(R.id.contextmenu_open_image_in_new_tab).setVisible(false);
-            menu.findItem(R.id.contextmenu_search_by_image).setVisible(false);
             menu.findItem(R.id.contextmenu_copy_image).setVisible(false);
         } else if (params.isImage() && !params.imageWasFetchedLoFi()) {
             menu.findItem(R.id.contextmenu_load_original_image).setVisible(false);
@@ -157,21 +154,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             if (mDelegate.getPageUrl().equals(params.getSrcUrl())) {
                 menu.findItem(R.id.contextmenu_open_image).setVisible(false);
             }
-            final TemplateUrlService templateUrlServiceInstance = TemplateUrlService.getInstance();
-            final boolean isSearchByImageAvailable =
-                    UrlUtilities.isDownloadableScheme(params.getSrcUrl())
-                            && templateUrlServiceInstance.isLoaded()
-                            && templateUrlServiceInstance.isSearchByImageAvailable()
-                            && templateUrlServiceInstance.getDefaultSearchEngineTemplateUrl()
-                                    != null;
-
-            menu.findItem(R.id.contextmenu_search_by_image).setVisible(isSearchByImageAvailable);
-            if (isSearchByImageAvailable) {
-                menu.findItem(R.id.contextmenu_search_by_image).setTitle(
-                        context.getString(R.string.contextmenu_search_web_for_image,
-                                TemplateUrlService.getInstance()
-                                        .getDefaultSearchEngineTemplateUrl().getShortName()));
-            }
         }
     }
 
@@ -233,9 +215,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             if (mDelegate.startDownload(params.getUnfilteredLinkUrl(), true)) {
                 helper.startContextMenuDownload(true, false);
             }
-        } else if (itemId == R.id.contextmenu_search_by_image) {
-            ContextMenuUma.record(params, ContextMenuUma.ACTION_SEARCH_BY_IMAGE);
-            mDelegate.onSearchByImageInNewTab();
         } else if (itemId == R.id.contextmenu_copy_image) {
             ContextMenuUma.record(params, ContextMenuUma.ACTION_COPY_IMAGE);
             mDelegate.onSaveImageToClipboard(params.getSrcUrl());
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
index b93931e..e7e8a0c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
@@ -198,14 +198,6 @@ public class TemplateUrlService {
     }
 
     /**
-     * @return Whether or not the default search engine has search by image support.
-     */
-    public boolean isSearchByImageAvailable() {
-        ThreadUtils.assertOnUiThread();
-        return nativeIsSearchByImageAvailable(mNativeTemplateUrlServiceAndroid);
-    }
-
-    /**
      * @return Whether the default configured search engine is for a Google property.
      */
     public boolean isDefaultSearchEngineGoogle() {
@@ -319,7 +311,6 @@ public class TemplateUrlService {
             long nativeTemplateUrlServiceAndroid, int selectedIndex);
     private native int nativeGetDefaultSearchProvider(long nativeTemplateUrlServiceAndroid);
     private native boolean nativeIsSearchProviderManaged(long nativeTemplateUrlServiceAndroid);
-    private native boolean nativeIsSearchByImageAvailable(long nativeTemplateUrlServiceAndroid);
     private native boolean nativeIsDefaultSearchEngineGoogle(long nativeTemplateUrlServiceAndroid);
     private native String nativeGetUrlForSearchQuery(long nativeTemplateUrlServiceAndroid,
             String query);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index 1da3f78..3fc570a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -484,11 +484,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
             mActivity.getTabModelSelector().openNewTab(loadUrlParams,
                     TabLaunchType.FROM_LONGPRESS_BACKGROUND, Tab.this, isIncognito());
         }
-
-        @Override
-        public void onSearchByImageInNewTab() {
-            triggerSearchByImage();
-        }
     }
 
     private class TabContentViewClient extends ContentViewClient {
@@ -2663,13 +2658,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     }
 
     /**
-     * Triggers native search by image method.
-     */
-    public void triggerSearchByImage() {
-        if (mNativeTabAndroid != 0) nativeSearchByImageInNewTabAsync(mNativeTabAndroid);
-    }
-
-    /**
      * @return The ID of the bookmark associated with the current URL (or -1 if no such bookmark
      *         exists).
      */
@@ -3032,7 +3020,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     private native void nativeUpdateTopControlsState(
             long nativeTabAndroid, int constraints, int current, boolean animate);
     private native void nativeLoadOriginalImage(long nativeTabAndroid);
-    private native void nativeSearchByImageInNewTabAsync(long nativeTabAndroid);
     private native long nativeGetBookmarkId(long nativeTabAndroid, boolean onlyEditable);
     private native boolean nativeHasOfflineCopy(long nativeTabAndroid);
     private native boolean nativeIsOfflinePage(long nativeTabAndroid);
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
index b5585a2..38063ee 100644
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -1255,9 +1255,6 @@ You are signing in with a managed account and giving its administrator control o
       <message name="IDS_CONTEXTMENU_LOAD_ORIGINAL_IMAGE" desc="Context sensitive menu item for Data Saver low fidelity placeholder images that loads the original version in place. [CHAR-LIMIT=30]">
         Load image
       </message>
-      <message name="IDS_CONTEXTMENU_SEARCH_WEB_FOR_IMAGE" desc="Context sensitive menu item for search-for-Image command in a new tab. [CHAR-LIMIT=30]">
-        Search <ph name="SEARCH_ENGINE">%1$s<ex>Google</ex></ph> for this image
-      </message>
       <message name="IDS_CONTEXTMENU_COPY_IMAGE" desc="Context sensitive menu item for copying an image to the clipboard. [CHAR-LIMIT=30]">
         Copy image
       </message>
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index d6fc362..029e636 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -95,14 +95,6 @@ using content::WebContents;
 using navigation_interception::InterceptNavigationDelegate;
 using navigation_interception::NavigationParams;
 
-namespace {
-
-const int kImageSearchThumbnailMinSize = 300 * 300;
-const int kImageSearchThumbnailMaxWidth = 600;
-const int kImageSearchThumbnailMaxHeight = 600;
-
-}  // namespace
-
 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
   CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents);
   if (!core_tab_helper)
@@ -760,17 +752,6 @@ void TabAndroid::LoadOriginalImage(JNIEnv* env, jobject obj) {
       render_frame_host->GetRoutingID()));
 }
 
-void TabAndroid::SearchByImageInNewTabAsync(JNIEnv* env, jobject obj) {
-  content::RenderFrameHost* render_frame_host =
-        web_contents()->GetMainFrame();
-  render_frame_host->Send(
-      new ChromeViewMsg_RequestThumbnailForContextNode(
-          render_frame_host->GetRoutingID(),
-          kImageSearchThumbnailMinSize,
-          gfx::Size(kImageSearchThumbnailMaxWidth,
-                    kImageSearchThumbnailMaxHeight)));
-}
-
 jlong TabAndroid::GetBookmarkId(JNIEnv* env,
                                jobject obj,
                                jboolean only_editable) {
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index 15f5f7e..d1a05d6 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -201,8 +201,6 @@ class TabAndroid : public CoreTabHelperDelegate,
 
   void LoadOriginalImage(JNIEnv* env, jobject obj);
 
-  void SearchByImageInNewTabAsync(JNIEnv* env, jobject obj);
-
   jlong GetBookmarkId(JNIEnv* env, jobject obj, jboolean only_editable);
 
   jboolean HasOfflineCopy(JNIEnv* env, jobject obj);
diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc
index b157f89..176d475 100644
--- a/chrome/browser/search_engines/template_url_service_android.cc
+++ b/chrome/browser/search_engines/template_url_service_android.cc
@@ -90,16 +90,6 @@ jboolean TemplateUrlServiceAndroid::IsSearchProviderManaged(JNIEnv* env,
   return template_url_service_->is_default_search_managed();
 }
 
-jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(JNIEnv* env,
-                                                             jobject obj) {
-  const TemplateURL* default_search_provider =
-      template_url_service_->GetDefaultSearchProvider();
-  return default_search_provider &&
-      !default_search_provider->image_url().empty() &&
-      default_search_provider->image_url_ref().IsValid(
-          template_url_service_->search_terms_data());
-}
-
 jboolean TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle(JNIEnv* env,
                                                                 jobject obj) {
   TemplateURL* default_search_provider =
diff --git a/chrome/browser/search_engines/template_url_service_android.h b/chrome/browser/search_engines/template_url_service_android.h
index 091ccd9..154bc0d 100644
--- a/chrome/browser/search_engines/template_url_service_android.h
+++ b/chrome/browser/search_engines/template_url_service_android.h
@@ -31,7 +31,6 @@ class TemplateUrlServiceAndroid : public TemplateURLServiceObserver {
   base::android::ScopedJavaLocalRef<jobject>
       GetPrepopulatedTemplateUrlAt(JNIEnv* env, jobject obj, jint index);
   jboolean IsSearchProviderManaged(JNIEnv* env, jobject obj);
-  jboolean IsSearchByImageAvailable(JNIEnv* env, jobject obj);
   jboolean IsDefaultSearchEngineGoogle(JNIEnv* env, jobject obj);
   base::android::ScopedJavaLocalRef<jstring> GetUrlForSearchQuery(
       JNIEnv* env,