Add back Rect parcelable to onSmartClipDataExtracted.

chrome/android/javatests/src/org/chromium/chrome/browser/SmartClipProviderTest.java

 // Copyright 2014 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.browser;
 
 import android.annotation.TargetApi;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
 import android.support.test.filters.MediumTest;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.ThreadUtils;
@@ skipping 26 matching lines @@
         }
 
         public String getText() {
             return mText;
         }
 
         public String getHtml() {
             return mHtml;
         }
 
-        public void notifyCalled(String title, String url, String text, String html) {
+        public Rect getRect() {
+            return mRect;
+        }
+
+        public void notifyCalled(String title, String url, String text, String html, Rect rect) {
             mTitle = title;
             mUrl = url;
             mText = text;
             mHtml = html;
+            mRect = rect;
             super.notifyCalled();
         }
 
         private String mTitle;
         private String mUrl;
         private String mText;
         private String mHtml;
+        private Rect mRect;
     }
 
     private ChromeActivity mActivity;
     private MyCallbackHelper mCallbackHelper;
     private HandlerThread mHandlerThread;
     private Handler mHandler;
     private Class<?> mSmartClipProviderClass;
     private Method mSetSmartClipResultHandlerMethod;
     private Method mExtractSmartClipDataMethod;
 
@@ skipping 40 matching lines @@
 
     // Implements Handler.Callback
     @Override
     public boolean handleMessage(Message msg) {
         Bundle bundle = msg.getData();
         assertNotNull(bundle);
         String url = bundle.getString("url");
         String title = bundle.getString("title");
         String text = bundle.getString("text");
         String html = bundle.getString("html");
+        Rect rect = bundle.getParcelable("rect");
         // We don't care about other values for now.
-        mCallbackHelper.notifyCalled(title, url, text, html);
+        mCallbackHelper.notifyCalled(title, url, text, html, rect);
         return true;
     }
 
     // Create SmartClipProvider interface from package meta-data.
     private Class<?> getSmartClipProviderClass() throws Exception {
         ApplicationInfo ai = mActivity.getPackageManager().getApplicationInfo(
                 mActivity.getPackageName(), PackageManager.GET_META_DATA);
         Bundle bundle = ai.metaData;
         String className = bundle.getString(SMART_CLIP_PROVIDER_KEY);
         assertNotNull(className);
@@ skipping 13 matching lines @@
                 if (found != null) return found;
             }
         }
         return null;
     }
 
     @MediumTest
     @Feature({"SmartClip"})
     @RetryOnFailure
     public void testSmartClipDataCallback() throws InterruptedException, TimeoutException {
+        final Rect rect = new Rect(10, 20, 110, 190);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 // This emulates what OEM will be doing when they want to call
                 // functions on SmartClipProvider through view hierarchy.
 
                 Object scp =
                         findSmartClipProvider(getActivity().findViewById(android.R.id.content));
                 assertNotNull(scp);
                 try {
                     mSetSmartClipResultHandlerMethod.invoke(scp, mHandler);
-                    mExtractSmartClipDataMethod.invoke(scp, 10, 20, 100, 70);
+                    mExtractSmartClipDataMethod.invoke(
+                            scp, rect.left, rect.top, rect.width(), rect.height());
                 } catch (Exception e) {
                     e.printStackTrace();
                     fail();
                 }
             }
         });
         mCallbackHelper.waitForCallback(0, 1);  // call count: 0 --> 1
         assertEquals("about:blank", mCallbackHelper.getTitle());
         assertEquals("about:blank", mCallbackHelper.getUrl());
         assertNotNull(mCallbackHelper.getText());
         assertNotNull(mCallbackHelper.getHtml());
+        assertNotNull(mCallbackHelper.getRect());
+        assertEquals(rect.left, mCallbackHelper.getRect().left);
+        assertEquals(rect.top, mCallbackHelper.getRect().top);
+        assertEquals(rect.width(), mCallbackHelper.getRect().width());
+        assertEquals(rect.height(), mCallbackHelper.getRect().height());
     }
 
     @MediumTest
     @Feature({"SmartClip"})
     @RetryOnFailure
     public void testSmartClipNoHandlerDoesntCrash() throws InterruptedException, TimeoutException {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 Object scp =
@@ skipping 10 matching lines @@
                     mExtractSmartClipDataMethod.invoke(scp, 10, 20, 100, 70);
                 } catch (Exception e) {
                     e.printStackTrace();
                     fail();
                 }
             }
         });
         mCallbackHelper.waitForCallback(0, 1); // call count: 0 --> 1
     }
 }