Android: Fix GPU.GPUProcessTerminationStatus UMA stat

content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

 // Copyright 2013 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.content.browser;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
@@ skipping 159 matching lines @@
 
         // Called on the main thread to notify that the child service did not disconnect gracefully.
         @Override
         public void onServiceDisconnected(ComponentName className) {
             synchronized (mLock) {
                 // Ensure that the disconnection logic runs only once (instead of once per each
                 // ChildServiceConnection).
                 if (mServiceDisconnected) {
                     return;
                 }
+                // Stash the status of the oom bindings, since stop() will release all bindings.
+                mWasOomProtected = isCurrentlyOomProtected();
                 mServiceDisconnected = true;
-                // Stash the status of the oom bindings, since stop() will release all bindings.
-                mWasOomProtected = mInitialBinding.isBound() || mStrongBinding.isBound();
                 Log.w(TAG, "onServiceDisconnected (crash or killed by oom): pid=" + mPid);
                 stop();  // We don't want to auto-restart on crash. Let the browser do that.
                 mDeathCallback.onChildProcessDied(ChildProcessConnectionImpl.this);
                 // If we have a pending connection callback, we need to communicate the failure to
                 // the caller.
                 if (mConnectionCallback != null) {
                     mConnectionCallback.onConnected(0);
                 }
                 mConnectionCallback = null;
             }
@@ skipping 207 matching lines @@
             mInitialBinding.unbind();
         }
     }
 
     @Override
     public boolean isOomProtectedOrWasWhenDied() {
         synchronized (mLock) {
             if (mServiceDisconnected) {
                 return mWasOomProtected;
             } else {
-                return mInitialBinding.isBound() || mStrongBinding.isBound();
+                return isCurrentlyOomProtected();
             }
         }
     }
 
+    private boolean isCurrentlyOomProtected() {
+        synchronized (mLock) {
+            assert !mServiceDisconnected;
+            if (mAlwaysInForeground) return ChildProcessLauncher.isApplicationInForeground();
+            return mInitialBinding.isBound() || mStrongBinding.isBound();
+        }
+    }
+
     @Override
     public void dropOomBindings() {
         synchronized (mLock) {
             assert !mAlwaysInForeground;
             mInitialBinding.unbind();
 
             mStrongBindingCount = 0;
             mStrongBinding.unbind();
         }
     }
@@ skipping 35 matching lines @@
             return true;
         }
         return false;
     }
 
     @VisibleForTesting
     public boolean isConnected() {
         return mService != null;
     }
 }