Snapshot of all changes to get jumbo in blink and content.

content/browser/web_contents/aura/overscroll_navigation_overlay.cc

 // Copyright 2014 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.
 
 #include "content/browser/web_contents/aura/overscroll_navigation_overlay.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/i18n/rtl.h"
@@ skipping 53 matching lines @@
              : UmaNavigationType::FORWARD_TOUCHSCREEN;
 }
 
 // Records UMA historgram and also user action for the cancelled overscroll.
 void RecordCancelled(OverscrollNavigationOverlay::NavigationDirection direction,
                      OverscrollSource source) {
   UMA_HISTOGRAM_ENUMERATION("Overscroll.Cancelled3",
                             GetUmaNavigationType(direction, source),
                             NAVIGATION_TYPE_COUNT);
   if (direction == OverscrollNavigationOverlay::BACK)
-    RecordAction(base::UserMetricsAction("Overscroll_Cancelled.Back"));
+    base::RecordAction(base::UserMetricsAction("Overscroll_Cancelled.Back"));
   else
-    RecordAction(base::UserMetricsAction("Overscroll_Cancelled.Forward"));
+    base::RecordAction(base::UserMetricsAction("Overscroll_Cancelled.Forward"));
 }
 
 }  // namespace
 
 // Responsible for fading out and deleting the layer of the overlay window.
 class OverlayDismissAnimator
     : public ui::LayerAnimationObserver {
  public:
   // Takes ownership of the layer.
   explicit OverlayDismissAnimator(std::unique_ptr<ui::Layer> layer)
@@ skipping 191 matching lines @@
     RecordCancelled(direction_, owa_->overscroll_source());
     loading_complete_ = true;
   }
 
   if (navigated) {
     UMA_HISTOGRAM_ENUMERATION(
         "Overscroll.Navigated3",
         GetUmaNavigationType(direction_, owa_->overscroll_source()),
         NAVIGATION_TYPE_COUNT);
     if (direction_ == BACK)
-      RecordAction(base::UserMetricsAction("Overscroll_Navigated.Back"));
+      base::RecordAction(base::UserMetricsAction("Overscroll_Navigated.Back"));
     else
-      RecordAction(base::UserMetricsAction("Overscroll_Navigated.Forward"));
+      base::RecordAction(base::UserMetricsAction("Overscroll_Navigated.Forward"));
     StartObserving();
   }
 
   direction_ = NONE;
   StopObservingIfDone();
 }
 
 void OverscrollNavigationOverlay::OnOverscrollCancelled() {
   RecordCancelled(direction_, owa_->overscroll_source());
   aura::Window* main_window = GetMainWindow();
@@ skipping 16 matching lines @@
 
 void OverscrollNavigationOverlay::DidStopLoading() {
   // Don't compare URLs in this case - it's possible they won't match if
   // a gesture-nav initiated navigation was interrupted by some other in-site
   // navigation (e.g., from a script, or from a bookmark).
   loading_complete_ = true;
   StopObservingIfDone();
 }
 
 }  // namespace content