Fix incognito tab restore regression

It seems that the logic from the downstream file is different from the
CL that upstreamed it. This CL restores the downstream logic.

Consider this case:

 type == TabLaunchType.FROM_LONGPRESS_BACKGROUND: FALSE
 type == TabLaunchType.FROM_RESTORE: TRUE
 mTabModelSelector.isIncognitoSelected(): FALSE
 isNewTabIncognito: TRUE

In the downstream version willOpenInForeground -> TRUE
In the current version willOpenInForeground -> FALSE which
incorrectlys restores the incognito tab even thought it isn't
the current tab model.

BUG=383470

Review URL: https://codereview.chromium.org/338833005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277851 0039d316-1c4b-4281-b951-d872f2087c98

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelOrderController.java

@@ -131,8 +131,8 @@ public class TabModelOrderController {
      */
     public boolean willOpenInForeground(TabLaunchType type, boolean isNewTabIncognito) {
         // Restore is handling the active index by itself.
-        return (type != TabLaunchType.FROM_LONGPRESS_BACKGROUND &&
-                        type != TabLaunchType.FROM_RESTORE)
+        if (type == TabLaunchType.FROM_RESTORE) return false;
+        return type != TabLaunchType.FROM_LONGPRESS_BACKGROUND
                 || (!mTabModelSelector.isIncognitoSelected() && isNewTabIncognito);
     }