Merge java_staging/src into java/src.

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.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.enhancedbookmarks;
 
 import android.app.Activity;
 import android.preference.PreferenceManager;
 import android.support.v4.widget.DrawerLayout;
 import android.util.Log;
@@ skipping 513 matching lines @@
         }
 
         @Override
         public boolean equals(Object obj) {
             if (!(obj instanceof UIState)) return false;
             UIState other = (UIState) obj;
             return mState == other.mState && mUrl.equals(other.mUrl);
         }
     }
 }