ContentView->ContentViewCore.getContainerView in chrome/ tests

ContentView->ContentViewCore.getContainerView in chrome/ tests

Many places that don't need ContentView proper and just need the View
managed by ContentViewCore.
BUG=360664
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266979

[Yaron, 2014-04-25 17:30:05]

bump

[aruslan1, 2014-04-25 17:36:55]

lgtm awesomeness!
(sorry - I thought I've already reviewed this one.)

https://codereview.chromium.org/251443004/diff/1/chrome/android/javatests/src...
File
chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
(right):

https://codereview.chromium.org/251443004/diff/1/chrome/android/javatests/src...
chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java:466:
ContentViewCore viewCore = getActivity().getActiveContentViewCore();
nit: could it be inline within the next statement?
if not -- make it final for consistency, thanks.

[Yaron, 2014-04-25 17:44:23]

The CQ bit was checked by yfriedman@chromium.org

[commit-bot: I haz the power, 2014-04-25 22:13:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/251443004/20001

[commit-bot: I haz the power, 2014-04-25 23:39:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-25 23:39:57]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_chromeos_rel

[Yaron, 2014-04-25 23:43:47]

The CQ bit was checked by yfriedman@chromium.org

[commit-bot: I haz the power, 2014-04-25 23:46:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/251443004/20001

[commit-bot: I haz the power, 2014-04-26 05:49:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-26 05:49:33]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_chromeos_rel

[tfarina, 2014-04-26 13:50:32]

The CQ bit was checked by tfarina@chromium.org

[commit-bot: I haz the power, 2014-04-26 13:51:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/251443004/20001

[commit-bot: I haz the power, 2014-04-26 22:44:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-26 22:44:11]

Failed to apply patch for
chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
  Hunk #2 FAILED at 463.
  Hunk #3 succeeded at 517 (offset 41 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java.rej

Patch:      
chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
Index:
chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
diff --git
a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
index
817b94586dfb0fa2dab255a8ac965f5f0a09acd1..3b079cbe09cbee4eed1aef0939d69b08acba6827
100644
---
a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
+++
b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
@@ -12,7 +12,6 @@ import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.shell.ChromeShellTestBase;
-import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -464,10 +463,10 @@ public class AutofillDialogControllerTest extends
ChromeShellTestBase {
 
         setUpAndRequestAutocomplete(url, requestFullBilling, requestShipping,
requestPhoneNumbers);
 
-        ContentView view = getActivity().getActiveContentView();
+        final ContentViewCore viewCore =
getActivity().getActiveContentViewCore();
 
         assertEquals(actualId + " did not match",
-                expected, DOMUtils.getNodeValue(view.getContentViewCore(),
actualId));
+                expected, DOMUtils.getNodeValue(viewCore, actualId));
     }
 
     private void verifyFieldsAreFilled(final boolean requestFullBilling,
@@ -477,8 +476,7 @@ public class AutofillDialogControllerTest extends
ChromeShellTestBase {
                 generatePage(requestFullBilling, requestShipping,
requestPhoneNumbers),
                 requestFullBilling, requestShipping, requestPhoneNumbers);
 
-        final ContentView view = getActivity().getActiveContentView();
-        final ContentViewCore viewCore = view.getContentViewCore();
+        final ContentViewCore viewCore =
getActivity().getActiveContentViewCore();
 
         assertEquals("billing name did not match",
                 TEST_NAME, DOMUtils.getNodeValue(viewCore, "id-billing-name"));

[Yaron, 2014-04-29 04:17:37]

The CQ bit was checked by yfriedman@chromium.org

[commit-bot: I haz the power, 2014-04-29 04:18:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/251443004/40001

[commit-bot: I haz the power, 2014-04-29 04:51:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-29 04:51:29]

Try jobs failed on following builders:
  tryserver.chromium on chromium_presubmit

[Yaron, 2014-04-29 16:04:45]

The CQ bit was checked by yfriedman@chromium.org

[commit-bot: I haz the power, 2014-04-29 16:05:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/251443004/40001

[Yaron, 2014-04-29 22:34:58]

The CQ bit was unchecked by yfriedman@chromium.org

[Yaron, 2014-04-29 22:35:11]

The CQ bit was checked by yfriedman@chromium.org

[commit-bot: I haz the power, 2014-04-29 22:36:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/251443004/40001

[commit-bot: I haz the power, 2014-04-29 22:38:16]

Change committed as 266979