[InstantExtended] Fixing how PageLoadSRP is emitted. Previously it was emitted only for Instant sea…

chrome/browser/ui/uma_browsing_activity_observer.cc

 // Copyright (c) 2012 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/ui/uma_browsing_activity_observer.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/search_engines/template_url_service.h"
+#include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/user_metrics.h"
 
 namespace chrome {
 namespace {
 
 UMABrowsingActivityObserver* g_instance = NULL;
 
 }  // namespace
 
 // static
 void UMABrowsingActivityObserver::Init() {
@@ skipping 13 matching lines @@
 UMABrowsingActivityObserver::~UMABrowsingActivityObserver() {
 }
 
 void UMABrowsingActivityObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     const content::LoadCommittedDetails& load =
         *content::Details<content::LoadCommittedDetails>(details).ptr();
+
+    content::NavigationController* controller =
+        content::Source<content::NavigationController>(source).ptr();
+    if (controller) {

[Mark P, 2013/08/06 19:38:36]

What can cause controller to be NULL here?

[Peter Kasting, 2013/08/06 21:32:19]

I don't think it can be.

[rpetterson, 2013/08/06 23:04:17]

I was being overcautious. Since it's the source, I agree that it can't be NULL
or else what would have sent the notification?

I've pulled out the surrounding if statement.

+      // Track whether the page loaded is a search results page (SRP). Track
+      // the non-SRP navigations as well so there is a control.
+      content::RecordAction(content::UserMetricsAction("NavEntryCommitted"));
+      Profile* profile =
+          Profile::FromBrowserContext(controller->GetBrowserContext());
+      bool is_search_results =
+          TemplateURLServiceFactory::GetForProfile(profile)->
+              IsSearchResultsPageFromDefaultSearchProvider(
+                  load.entry->GetURL());
+      if (is_search_results)

[Mark P, 2013/08/06 19:38:36]

optional nit: consider inlining the alias above rather than using an extra
variable.  Or at least making the alias const.

[rpetterson, 2013/08/06 23:04:17]

Done.

+          content::RecordAction(
+              content::UserMetricsAction("NavEntryCommitted.SRP"));
+    }
+
     if (!load.is_navigation_to_different_page())
       return;  // Don't log for subframes or other trivial types.
 
     LogRenderProcessHostCount();
     LogBrowserTabCount();
   } else if (type == chrome::NOTIFICATION_APP_TERMINATING) {
     delete g_instance;
     g_instance = NULL;
   }
 }
@@ skipping 41 matching lines @@
   // Record how many windows are open, by type.
   UMA_HISTOGRAM_COUNTS_100("WindowManager.AppWindowCountPerLoad",
                            app_window_count);
   UMA_HISTOGRAM_COUNTS_100("WindowManager.PopUpWindowCountPerLoad",
                            popup_window_count);
   UMA_HISTOGRAM_COUNTS_100("WindowManager.TabbedWindowCountPerLoad",
                            tabbed_window_count);
 }
 
 }  // namespace chrome