Merge java_staging/src into java/src.

chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaUpdateInfobar.java

 // Copyright 2015 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.omaha;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ skipping 89 matching lines @@
             recordHistograms(ACTION_CLICKED_UPDATE_FAIL);
         }
     }
 
     /** Returns the URL that is supposed to be opened when the button is clicked. */
     @VisibleForTesting
     public String getUrl() {
         return mUrl;
     }
 }