🔍 Introduce default search engine dialog

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java

Index: chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java
index 66ad59579eb6504c686f8f6d19d7e78ed7aaf254..aa6a79319e568569b67937467fa0ea7322759ca1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java
@@ -6,14 +6,11 @@ package org.chromium.chrome.browser.searchwidget;
 
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.chrome.browser.ntp.NewTabPage;
-import org.chromium.chrome.browser.omnibox.LocationBarLayout;
-import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
 
-class SearchBoxDataProvider implements ToolbarDataProvider, TemplateUrlService.LoadListener {
+class SearchBoxDataProvider implements ToolbarDataProvider {
     private Tab mTab;
-    private String mVerbatimUrl;
 
     /**
      * Called when native library is loaded and a tab has been initialized.
@@ -21,22 +18,7 @@ class SearchBoxDataProvider implements ToolbarDataProvider, TemplateUrlService.L
      */
     public void onNativeLibraryReady(Tab tab) {
         assert LibraryLoader.isInitialized();
-
         mTab = tab;
-
-        TemplateUrlService service = TemplateUrlService.getInstance();
-        service.registerLoadListener(this);
-        service.load();
-    }
-
-    @Override
-    public void onTemplateUrlServiceLoaded() {
-        // For zero suggest, the default search engine's URL is used as the first suggestion.
-        TemplateUrlService service = TemplateUrlService.getInstance();
-        service.unregisterLoadListener(this);
-        String searchEngineUrl = service.getSearchEngineUrlFromTemplateUrl(
-                service.getDefaultSearchEngineTemplateUrl().getKeyword());
-        mVerbatimUrl = LocationBarLayout.splitPathFromUrlDisplayText(searchEngineUrl).first;
     }
 
     @Override
@@ -72,6 +54,6 @@ class SearchBoxDataProvider implements ToolbarDataProvider, TemplateUrlService.L
 
     @Override
     public String getCurrentUrl() {
-        return mVerbatimUrl;
+        return SearchWidgetProvider.sVerbatimUrl;

[Ted C, 2017/04/26 20:21:52]

I would rather this be a static getter function.

How do you know the updateCached... method is called in the other file before
getting here?  The ordering dependency is a bit scary IMO.

[gone, 2017/04/26 21:45:15]

It doesn't seem to be functionally any different.  I think getCurrentUrl() can
already be called before the TemplateUrlService is finished loading.

     }
 }