Remove listening of OMNIBOX_OPENED_URL from metrics code

chrome/browser/metrics/thread_watcher.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/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 670 matching lines @@
                            content::NotificationService::AllSources());
   observer->registrar_.Add(observer,
                            content::NOTIFICATION_LOAD_STOP,
                            content::NotificationService::AllSources());
   observer->registrar_.Add(observer,
                            content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                            content::NotificationService::AllSources());
   observer->registrar_.Add(observer,
                            content::NOTIFICATION_RENDER_WIDGET_HOST_HANG,
                            content::NotificationService::AllSources());
-  observer->registrar_.Add(observer,
-                           chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
-                           content::NotificationService::AllSources());
+  observer->omnibox_url_opened_subscription_ =
+      OmniboxEventGlobalTracker::GetInstance()->RegisterCallback(
+          base::Bind(&ThreadWatcherObserver::OnURLOpenedFromOmnibox,
+                     base::Unretained(observer)));
 }
 
 // static
 void ThreadWatcherObserver::RemoveNotifications() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!g_thread_watcher_observer_)
     return;
   g_thread_watcher_observer_->registrar_.RemoveAll();
   delete g_thread_watcher_observer_;
 }
 
 void ThreadWatcherObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
+  OnUserActivityDetected();
+}
+
+void ThreadWatcherObserver::OnURLOpenedFromOmnibox(OmniboxLog* log) {
+  OnUserActivityDetected();
+}

[Alexei Svitkine (slow), 2015/08/07 14:57:37]

Nit: Add an empty line after this.

[blundell, 2015/08/17 09:24:01]

Done.

+void ThreadWatcherObserver::OnUserActivityDetected() {
   // There is some user activity, see if thread watchers are to be awakened.
   base::TimeTicks now = base::TimeTicks::Now();
   if ((now - last_wakeup_time_) < wakeup_interval_)
     return;
   last_wakeup_time_ = now;
   WatchDogThread::PostTask(
       FROM_HERE,
       base::Bind(&ThreadWatcherList::WakeUpAll));
 }
 
@@ skipping 211 matching lines @@
 
 #if defined(OS_WIN)
   // On Windows XP, give twice the time for shutdown.
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     actual_duration *= 2;
 #endif
 
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();
 }