Revert "Changed NavigationController access to through tab in Java code"

chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.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.metrics;
 
 import android.content.ComponentCallbacks;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.text.TextUtils;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.privacy.CrashReportingPermissionManager;
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
 import org.chromium.components.variations.VariationsAssociatedData;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.NetworkChangeNotifier;
 
 /**
  * Mainly sets up session stats for chrome. A session is defined as the duration when the
  * application is in the foreground.  Also used to communicate information between Chrome
  * and the framework's MetricService.
  */
 public class UmaSessionStats implements NetworkChangeNotifier.ConnectionTypeObserver {
     public static final String LAST_USED_TIME_PREF = "umasessionstats.lastusedtime";
 
@@ skipping 14 matching lines @@
     private final CrashReportingPermissionManager mReportingPermissionManager;
 
     public UmaSessionStats(Context context) {
         mContext = context;
         mIsMultiWindowCapable = context.getPackageManager().hasSystemFeature(
                 SAMSUNG_MULTWINDOW_PACKAGE);
         mReportingPermissionManager = PrivacyPreferencesManager.getInstance();
     }
 
     private void recordPageLoadStats(Tab tab) {
-        boolean isDesktopUserAgent = tab.getNavigationHandler() != null
-                && tab.getNavigationHandler().getUseDesktopUserAgent();
+        WebContents webContents = tab.getWebContents();
+        boolean isDesktopUserAgent = webContents != null
+                && webContents.getNavigationController().getUseDesktopUserAgent();
         nativeRecordPageLoaded(isDesktopUserAgent);
         if (mKeyboardConnected) {
             nativeRecordPageLoadedWithKeyboard();
         }
 
         // If the session has ended (i.e. chrome is in the background), escape early. Ideally we
         // could track this number as part of either the previous or next session but this isn't
         // possible since the TabSelector is needed to figure out the current number of open tabs.
         if (mTabModelSelector == null) return;
 
@@ skipping 150 matching lines @@
     private static native void nativeRegisterExternalExperiment(
             String studyName, int[] experimentIds);
     private static native void nativeRegisterSyntheticFieldTrial(
             String trialName, String groupName);
     private static native void nativeRecordMultiWindowSession(int areaPercent, int instanceCount);
     private static native void nativeRecordTabCountPerLoad(int numTabsOpen);
     private static native void nativeRecordPageLoaded(boolean isDesktopUserAgent);
     private static native void nativeRecordPageLoadedWithKeyboard();
 
 }