Update integration acquiring page annotations with new endpoint

There is a new endpoint for serving page annotation data. This CL
updates to the new endpoint.

Bug: 1149236
Change-Id: I65f4f30473654bccf8392144e1f585177af32fb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541578
Commit-Queue: David Maunder <davidjm@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830049}

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java

@@ -75,7 +75,8 @@ public class TabSuggestionsServerFetcher implements TabSuggestionsFetcher {
                     -> { fetchCallback(res, callback, tabContext); },
                     mProfileForTesting == null ? Profile.getLastUsedRegularProfile()
                                                : mProfileForTesting,
-                    ENDPOINT, METHOD, CONTENT_TYPE, getTabContextJson(tabContext), TIMEOUT_MS);
+                    ENDPOINT, METHOD, CONTENT_TYPE, getTabContextJson(tabContext), TIMEOUT_MS,
+                    new String[] {});
         } catch (JSONException e) {
             // Soft failure for now so we don't crash the app and fall back on client side
             // providers.

chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcherUnitTest.java

@@ -114,21 +114,21 @@ public class TabSuggestionsServerFetcherUnitTest {
         doAnswer(new Answer<Void>() {
             @Override
             public Void answer(InvocationOnMock invocation) {
-                Callback callback = (Callback) invocation.getArguments()[6];
+                Callback callback = (Callback) invocation.getArguments()[7];
                 callback.onResult(new EndpointResponse(response));
                 return null;
             }
         })
                 .when(mEndpointFetcherJniMock)
                 .nativeFetchChromeAPIKey(any(Profile.class), anyString(), anyString(), anyString(),
-                        anyString(), anyLong(), any(Callback.class));
+                        anyString(), anyLong(), any(String[].class), any(Callback.class));
     }
 
     private void verifyEndpointArguments() {
         verify(mEndpointFetcherJniMock)
                 .nativeFetchChromeAPIKey(eq(mProfile), eq(EXPECTED_ENDPOINT_URL),
                         eq(EXPECTED_METHOD), eq(EXPECTED_CONTENT_TYPE), any(String.class),
-                        eq(EXPECTED_TIMEOUT), any(Callback.class));
+                        eq(EXPECTED_TIMEOUT), any(String[].class), any(Callback.class));
     }
 
     @Test

chrome/android/javatests/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabDataTest.java

@@ -36,7 +36,6 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 
-import java.util.Locale;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -70,13 +69,18 @@ public class ShoppingPersistedTabDataTest {
 
     private static final String EMPTY_PRICE = "";
     private static final String ENDPOINT_RESPONSE_INITIAL =
-            "{\"representations\" : [{\"type\" : \"SHOPPING\", \"productTitle\" : \"Book of Pie\","
-            + String.format(Locale.US, "\"price\" : %d, \"currency\" : \"USD\"}]}", PRICE_MICROS);
+            "{\"annotations\":[{\"type\":\"DOCUMENT_INTENT\",\"documentIntent\":"
+            + "{\"intent\":\"UNKNOWN\"}},{\"type\":\"BUYABLE_PRODUCT\",\"buyableProduct\":"
+            + "{\"title\":\"foo title\",\"imageUrl\":\"https://images.com?q=1234\","
+            + "\"currentPrice\":{\"currencyCode\":\"USD\",\"amountMicros\":\"123456789012345\"},"
+            + "\"referenceType\":\"MAIN_PRODUCT\"}}]}";
 
     private static final String ENDPOINT_RESPONSE_UPDATE =
-            "{\"representations\" : [{\"type\" : \"SHOPPING\", \"productTitle\" : \"Book of Pie\","
-            + String.format(
-                    Locale.US, "\"price\" : %d, \"currency\" : \"USD\"}]}", UPDATED_PRICE_MICROS);
+            "{\"annotations\":[{\"type\":\"DOCUMENT_INTENT\",\"documentIntent\":"
+            + "{\"intent\":\"UNKNOWN\"}},{\"type\":\"BUYABLE_PRODUCT\",\"buyableProduct\":"
+            + "{\"title\":\"foo title\",\"imageUrl\":\"https://images.com?q=1234\","
+            + "\"currentPrice\":{\"currencyCode\":\"USD\",\"amountMicros\":\"287000000\"},"
+            + "\"referenceType\":\"MAIN_PRODUCT\"}}]}";
 
     @Before
     public void setUp() {
@@ -454,9 +458,8 @@ public class ShoppingPersistedTabDataTest {
 
     private void verifyEndpointFetcherCalled(int numTimes) {
         verify(mEndpointFetcherJniMock, times(numTimes))
-                .nativeFetchOAuth(any(Profile.class), anyString(), anyString(), anyString(),
-                        anyString(), any(String[].class), anyString(), anyLong(),
-                        any(Callback.class));
+                .nativeFetchChromeAPIKey(any(Profile.class), anyString(), anyString(), anyString(),
+                        anyString(), anyLong(), any(String[].class), any(Callback.class));
     }
 
     private static Tab createTabOnUiThread(int tabId, boolean isIncognito) {
@@ -479,7 +482,7 @@ public class ShoppingPersistedTabDataTest {
         doAnswer(new Answer<Void>() {
             @Override
             public Void answer(InvocationOnMock invocation) {
-                Callback callback = (Callback) invocation.getArguments()[8];
+                Callback callback = (Callback) invocation.getArguments()[7];
                 String res = mCalledOnce ? ENDPOINT_RESPONSE_UPDATE : ENDPOINT_RESPONSE_INITIAL;
                 mCalledOnce = true;
                 callback.onResult(new EndpointResponse(res));
@@ -487,9 +490,8 @@ public class ShoppingPersistedTabDataTest {
             }
         })
                 .when(mEndpointFetcherJniMock)
-                .nativeFetchOAuth(any(Profile.class), anyString(), anyString(), anyString(),
-                        anyString(), any(String[].class), anyString(), anyLong(),
-                        any(Callback.class));
+                .nativeFetchChromeAPIKey(any(Profile.class), anyString(), anyString(), anyString(),
+                        anyString(), anyLong(), any(String[].class), any(Callback.class));
     }
 
     private static void acquireSemaphore(Semaphore semaphore) {

chrome/browser/endpoint_fetcher/endpoint_fetcher.cc

@@ -64,6 +64,7 @@ EndpointFetcher::EndpointFetcher(
     const std::string& content_type,
     int64_t timeout_ms,
     const std::string& post_data,
+    const std::vector<std::string>& headers,
     const net::NetworkTrafficAnnotationTag& annotation_tag)
     : auth_type_(CHROME_API_KEY),
       url_(url),
@@ -71,6 +72,7 @@ EndpointFetcher::EndpointFetcher(
       content_type_(content_type),
       timeout_ms_(timeout_ms),
       post_data_(post_data),
+      headers_(headers),
       annotation_tag_(annotation_tag),
       url_loader_factory_(
           content::BrowserContext::GetDefaultStoragePartition(profile)
@@ -165,6 +167,10 @@ void EndpointFetcher::PerformRequest(
   if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) {
     resource_request->headers.SetHeader(kContentTypeKey, content_type_);
   }
+  DCHECK(headers_.size() % 2 == 0);
+  for (size_t i = 0; i + 1 < headers_.size(); i += 2) {
+    resource_request->headers.SetHeader(headers_[i], headers_[i + 1]);
+  }
   switch (auth_type_) {
     case OAUTH:
       resource_request->headers.SetHeader(
@@ -304,13 +310,16 @@ static void JNI_EndpointFetcher_NativeFetchChromeAPIKey(
     const base::android::JavaParamRef<jstring>& jcontent_type,
     const base::android::JavaParamRef<jstring>& jpost_data,
     jlong jtimeout,
+    const base::android::JavaParamRef<jobjectArray>& jheaders,
     const base::android::JavaParamRef<jobject>& jcallback) {
+  std::vector<std::string> headers;
+  base::android::AppendJavaStringArrayToStringVector(env, jheaders, &headers);
   auto endpoint_fetcher = std::make_unique<EndpointFetcher>(
       ProfileAndroid::FromProfileAndroid(jprofile),
       GURL(base::android::ConvertJavaStringToUTF8(env, jurl)),
       base::android::ConvertJavaStringToUTF8(env, jhttps_method),
       base::android::ConvertJavaStringToUTF8(env, jcontent_type), jtimeout,
-      base::android::ConvertJavaStringToUTF8(env, jpost_data),
+      base::android::ConvertJavaStringToUTF8(env, jpost_data), headers,
       NO_TRAFFIC_ANNOTATION_YET);
   endpoint_fetcher->PerformRequest(
       base::BindOnce(&OnEndpointFetcherComplete,

chrome/browser/endpoint_fetcher/endpoint_fetcher.h

@@ -69,6 +69,7 @@ class EndpointFetcher {
                   const std::string& content_type,
                   int64_t timeout_ms,
                   const std::string& post_data,
+                  const std::vector<std::string>& headers,
                   const net::NetworkTrafficAnnotationTag& annotation_tag);
 
   // Constructor if no authentication is needed.
@@ -121,6 +122,7 @@ class EndpointFetcher {
   const std::string content_type_;
   int64_t timeout_ms_;
   const std::string post_data_;
+  const std::vector<std::string> headers_;
   const net::NetworkTrafficAnnotationTag annotation_tag_;
   signin::ScopeSet oauth_scopes_;
 

chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java

@@ -56,14 +56,16 @@ public final class EndpointFetcher {
      * @param postData data for a "POST" request
      * @param timeout time after which the request will terminate in the event a response hasn't
      *         been received
+     * @param headers headers for the request. Key/value pairs are stored sequentially in the array.
      */
     @MainThread
     public static void fetchUsingChromeAPIKey(Callback<EndpointResponse> callback, Profile profile,
-            String url, String httpsMethod, String contentType, String postData, long timeout) {
+            String url, String httpsMethod, String contentType, String postData, long timeout,
+            String[] headers) {
         // EndpointFetcher currently does not support incognito mode
         // assert !profile.isOffTheRecord();
         EndpointFetcherJni.get().nativeFetchChromeAPIKey(
-                profile, url, httpsMethod, contentType, postData, timeout, callback);
+                profile, url, httpsMethod, contentType, postData, timeout, headers, callback);
     }
 
     @NativeMethods
@@ -72,7 +74,7 @@ public final class EndpointFetcher {
                 String httpsMethod, String contentType, String[] scopes, String postData,
                 long timeout, Callback<EndpointResponse> callback);
         void nativeFetchChromeAPIKey(Profile profile, String url, String httpsMethod,
-                String contentType, String postData, long timeout,
+                String contentType, String postData, long timeout, String[] headers,
                 Callback<EndpointResponse> callback);
         void nativeFetchWithNoAuth(
                 Profile profile, String url, Callback<EndpointResponse> callback);

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabData.java

@@ -29,21 +29,23 @@ import java.util.concurrent.TimeUnit;
  */
 public class ShoppingPersistedTabData extends PersistedTabData {
     private static final String TAG = "SPTD";
-    private static final String ENDPOINT =
-            "https://task-management-chrome.sandbox.google.com/tabs/representations?url=%s&locale=en:US";
-    private static final String[] SCOPES =
-            new String[] {"https://www.googleapis.com/auth/userinfo.email",
-                    "https://www.googleapis.com/auth/userinfo.profile"};
+    private static final String ENDPOINT = "https://memex-pa.googleapis.com/v1/annotations?url=%s";
     private static final long TIMEOUT_MS = 1000L;
     private static final String HTTPS_METHOD = "GET";
     private static final String CONTENT_TYPE = "application/json; charset=UTF-8";
     private static final String OAUTH_NAME = "SPTD";
     private static final String EMPTY_POST_DATA = "";
 
-    private static final String REPRESENTATIONS_KEY = "representations";
+    private static final String ANNOTATIONS_KEY = "annotations";
     private static final String PRICE_KEY = "price";
     private static final String TYPE_KEY = "type";
-    private static final String SHOPPING_ID = "SHOPPING";
+    private static final String BUYABLE_PRODUCT_ANNOTATION_KEY = "BUYABLE_PRODUCT";
+    private static final String BUYABLE_PRODUCT_KEY = "buyableProduct";
+    private static final String CURRENT_PRICE_KEY = "currentPrice";
+    private static final String AMOUNT_MICROS_KEY = "amountMicros";
+    private static final String ACCEPT_LANGUAGE_KEY = "Accept-Language";
+    // TODO(crbug.com/1130068) support all locales
+    private static final String ACCEPT_LANGUAGE_VALUE = "en-US";
 
     private static final Class<ShoppingPersistedTabData> USER_DATA_KEY =
             ShoppingPersistedTabData.class;
@@ -112,16 +114,17 @@ public class ShoppingPersistedTabData extends PersistedTabData {
                         -> {
                     ShoppingPersistedTabData previousShoppingPersistedTabData =
                             PersistedTabData.from(tab, USER_DATA_KEY);
-                    EndpointFetcher.fetchUsingOAuth(
+                    EndpointFetcher.fetchUsingChromeAPIKey(
                             (endpointResponse)
                                     -> {
                                 supplierCallback.onResult(
                                         build(tab, endpointResponse.getResponseString(),
                                                 previousShoppingPersistedTabData));
                             },
-                            Profile.getLastUsedRegularProfile(), OAUTH_NAME,
-                            String.format(Locale.US, ENDPOINT, tab.getUrlString()), HTTPS_METHOD,
-                            CONTENT_TYPE, SCOPES, EMPTY_POST_DATA, TIMEOUT_MS);
+                            Profile.getLastUsedRegularProfile(),
+                            String.format(ENDPOINT, tab.getUrlString()), HTTPS_METHOD, CONTENT_TYPE,
+                            EMPTY_POST_DATA, TIMEOUT_MS,
+                            new String[] {ACCEPT_LANGUAGE_KEY, ACCEPT_LANGUAGE_VALUE});
                 },
                 ShoppingPersistedTabData.class, callback);
     }
@@ -131,12 +134,14 @@ public class ShoppingPersistedTabData extends PersistedTabData {
         ShoppingPersistedTabData res = new ShoppingPersistedTabData(tab);
         try {
             JSONObject jsonObject = new JSONObject(responseString);
-            JSONArray representations = jsonObject.getJSONArray(REPRESENTATIONS_KEY);
-            for (int i = 0; i < representations.length(); i++) {
-                JSONObject representation = representations.getJSONObject(i);
-                if (SHOPPING_ID.equals(representation.getString(TYPE_KEY))) {
-                    res.setPriceMicros(
-                            representation.getLong(PRICE_KEY), previousShoppingPersistedTabData);
+            JSONArray annotations = jsonObject.getJSONArray(ANNOTATIONS_KEY);
+            for (int i = 0; i < annotations.length(); i++) {
+                JSONObject annotation = annotations.getJSONObject(i);
+                if (BUYABLE_PRODUCT_ANNOTATION_KEY.equals(annotation.getString(TYPE_KEY))) {
+                    JSONObject metadata = annotation.getJSONObject(BUYABLE_PRODUCT_KEY);
+                    JSONObject priceMetadata = metadata.getJSONObject(CURRENT_PRICE_KEY);
+                    res.setPriceMicros(Long.parseLong(priceMetadata.getString(AMOUNT_MICROS_KEY)),
+                            previousShoppingPersistedTabData);
                     break;
                 }
             }