chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java - Issue 1190103002: Make lint fail builds.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java

Issue 1190103002: Make lint fail builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: set android_webview to use minsdk 19 Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« build/android/lint/suppressions.xml ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImplTest.java ('k') | chrome/android/javatests_shell/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java » ('j') | chrome/android/javatests_shell/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java

index 026974f8147d556a20760f949af29cb13724441d..c0d637ec08610f3a6f8d6a2b69f7c9ad355302cc 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java

@@ -4,7 +4,6 @@

package org.chromium.chrome.browser.webapps;

-import android.R;

import android.app.Activity;

import android.content.Context;

import android.content.Intent;

@@ -107,7 +106,7 @@ public class WebappModeTest extends MultiActivityTestBase {

public boolean isSatisfied() {

Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity();

return lastActivity instanceof WebappActivity

- && lastActivity.findViewById(R.id.content).hasWindowFocus();

+ && lastActivity.findViewById(android.R.id.content).hasWindowFocus();

}

}));

assertTrue(isNumberOfRunningActivitiesCorrect(1));

@@ -120,7 +119,7 @@ public class WebappModeTest extends MultiActivityTestBase {

public boolean isSatisfied() {

Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity();

return lastActivity instanceof WebappActivity && lastActivity != firstActivity

- && lastActivity.findViewById(R.id.content).hasWindowFocus();

+ && lastActivity.findViewById(android.R.id.content).hasWindowFocus();

}

}));

assertTrue(isNumberOfRunningActivitiesCorrect(2));

@@ -132,7 +131,7 @@ public class WebappModeTest extends MultiActivityTestBase {

public boolean isSatisfied() {

Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity();

return lastActivity instanceof WebappActivity && lastActivity == firstActivity

- && lastActivity.findViewById(R.id.content).hasWindowFocus();

+ && lastActivity.findViewById(android.R.id.content).hasWindowFocus();

}

}));

assertTrue(isNumberOfRunningActivitiesCorrect(2));

@@ -152,7 +151,7 @@ public class WebappModeTest extends MultiActivityTestBase {

@Override

public boolean isSatisfied() {

Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity();

- View rootView = lastActivity.findViewById(R.id.content);

+ View rootView = lastActivity.findViewById(android.R.id.content);

return lastActivity instanceof WebappActivity && rootView.hasWindowFocus();

}

}));

@@ -192,7 +191,7 @@ public class WebappModeTest extends MultiActivityTestBase {

@Override

public boolean isSatisfied() {

Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity();

- if (!lastActivity.findViewById(R.id.content).hasWindowFocus()) return false;

+ if (!lastActivity.findViewById(android.R.id.content).hasWindowFocus()) return false;

return lastActivity instanceof ChromeTabbedActivity

|| lastActivity instanceof DocumentActivity;

}

@@ -206,7 +205,7 @@ public class WebappModeTest extends MultiActivityTestBase {

public boolean isSatisfied() {

Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity();

return lastActivity instanceof WebappActivity && lastActivity != firstActivity

- && lastActivity.findViewById(R.id.content).hasWindowFocus();

+ && lastActivity.findViewById(android.R.id.content).hasWindowFocus();

}

}));

}