DataUseTabModel should check the URL to differentiate history navigation

chrome/browser/android/data_usage/data_use_ui_tab_model.cc

 // 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.
 
 #include "chrome/browser/android/data_usage/data_use_ui_tab_model.h"
 
 #include <utility>
 
 #include "base/logging.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
 namespace chrome {
 
 namespace android {
 
 DataUseUITabModel::DataUseUITabModel() : weak_factory_(this) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
 
 DataUseUITabModel::~DataUseUITabModel() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (data_use_tab_model_)
     data_use_tab_model_->RemoveObserver(this);
 }
 
 void DataUseUITabModel::ReportBrowserNavigation(
     const GURL& gurl,
     ui::PageTransition page_transition,
     SessionID::id_type tab_id) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_LE(0, tab_id);
 
   DataUseTabModel::TransitionType transition_type;
 
   if (data_use_tab_model_ &&
-      ConvertTransitionType(page_transition, &transition_type)) {
+      ConvertTransitionType(page_transition, gurl, &transition_type)) {
     data_use_tab_model_->OnNavigationEvent(tab_id, transition_type, gurl,
                                            std::string());
   }
 }
 
 void DataUseUITabModel::ReportTabClosure(SessionID::id_type tab_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_LE(0, tab_id);
   if (data_use_tab_model_)
     data_use_tab_model_->OnTabCloseEvent(tab_id);
@@ skipping 93 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   TabEvents::const_iterator it = tab_events_.find(tab_id);
 
   if (it != tab_events_.end() && it->second == DATA_USE_CONTINUE_CLICKED)
     return false;
 
   DataUseTabModel::TransitionType transition_type;
 
   if (!ConvertTransitionType(ui::PageTransitionFromInt(page_transition),
-                             &transition_type)) {
+                             GURL(url), &transition_type)) {
     return false;
   }
 
   if (!data_use_tab_model_)
     return false;
 
   return data_use_tab_model_->WouldNavigationEventEndTracking(
       tab_id, transition_type, GURL(url));
 }
 
@@ skipping 34 matching lines @@
 
   if (it->second == event) {
     tab_events_.erase(it);
     return true;
   }
   return false;
 }
 
 bool DataUseUITabModel::ConvertTransitionType(
     ui::PageTransition page_transition,
+    const GURL& gurl,
     DataUseTabModel::TransitionType* transition_type) const {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!ui::PageTransitionIsMainFrame(page_transition) ||
       (((page_transition & ui::PAGE_TRANSITION_CORE_MASK) !=
         ui::PAGE_TRANSITION_RELOAD) &&
        !ui::PageTransitionIsNewNavigation(page_transition))) {
     return false;
   }
 
   switch (page_transition & ui::PAGE_TRANSITION_CORE_MASK) {
     case ui::PAGE_TRANSITION_LINK:
       if ((page_transition & ui::PAGE_TRANSITION_FROM_API) != 0) {
         // Clicking on bookmarks.
         *transition_type = DataUseTabModel::TRANSITION_BOOKMARK;
         return true;
       }
       // Newtab, clicking on a link.
       *transition_type = DataUseTabModel::TRANSITION_LINK;
       return true;
     case ui::PAGE_TRANSITION_TYPED:
       *transition_type = DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION;
       return true;
     case ui::PAGE_TRANSITION_AUTO_BOOKMARK:
       // Auto bookmark from newtab page.
       *transition_type = DataUseTabModel::TRANSITION_BOOKMARK;
       return true;
     case ui::PAGE_TRANSITION_AUTO_TOPLEVEL:
-      // History menu.
-      *transition_type = DataUseTabModel::TRANSITION_HISTORY_ITEM;
-      return true;
+      if (gurl == GURL(kChromeUIHistoryFrameURL) ||
+          gurl == GURL(kChromeUIHistoryURL)) {
+        // History menu.
+        *transition_type = DataUseTabModel::TRANSITION_HISTORY_ITEM;
+        return true;
+      }
+      return false;
     case ui::PAGE_TRANSITION_GENERATED:
       // Omnibox search (e.g., searching for "tacos").
       *transition_type = DataUseTabModel::TRANSITION_OMNIBOX_SEARCH;
       return true;
     case ui::PAGE_TRANSITION_RELOAD:
       if ((page_transition & ui::PAGE_TRANSITION_FORWARD_BACK) == 0) {
         // Restored tabs or user reloaded the page.
         // TODO(rajendrant): Handle only the tab restore case. We are only
         // interested in that.
         *transition_type = DataUseTabModel::TRANSITION_RELOAD;
         return true;
       }
       return false;
     default:
       return false;
   }
 }
 
 }  // namespace android
 
 }  // namespace chrome