Fix SearchBox::LogEvent for out-of-process iframes.

chrome/renderer/searchbox/searchbox.cc

 // Copyright 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/renderer/searchbox/searchbox.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 142 matching lines @@
     display_instant_results_(false),
     most_visited_items_cache_(kMaxInstantMostVisitedItemCacheSize),
     query_(),
     start_margin_(0) {
 }
 
 SearchBox::~SearchBox() {
 }
 
 void SearchBox::LogEvent(NTPLoggingEventType event) {
-  // navigation_start in ms.
-  uint64 start = 1000 * (render_view()->GetMainRenderFrame()->GetWebFrame()->
-      performance().navigationStart());
-  uint64 now =
-      (base::TimeTicks::Now() - base::TimeTicks::UnixEpoch()).InMilliseconds();
-  DCHECK(now >= start);
-  base::TimeDelta delta = base::TimeDelta::FromMilliseconds(now - start);
+  base::TimeDelta delta;

[Charlie Reis, 2015/03/20 21:37:52]

nit: Put below the comment.

[alexmos, 2015/03/20 21:50:57]

Done.

+  // The main frame for the current RenderView may be out-of-process, in which
+  // case it won't have navigationStart().  Use a delta of 0 in this case.

[Charlie Reis, 2015/03/20 21:37:52]

s/navigationStart()/performance()/

Also, "Use the default delta of 0..."

[alexmos, 2015/03/20 21:50:57]

Done.

+  if (!render_view()->GetWebView()->mainFrame()->isWebRemoteFrame()) {

[Charlie Reis, 2015/03/20 21:37:52]

Is there a reason to do !isWebRemoteFrame() rather than isWebLocalFrame()?

[alexmos, 2015/03/20 21:50:57]

Thanks, fixed.  Just forgot to switch it around.

+    // navigation_start in ms.
+    uint64 start = 1000 * (render_view()->GetMainRenderFrame()->GetWebFrame()->
+        performance().navigationStart());
+    uint64 now = (base::TimeTicks::Now() - base::TimeTicks::UnixEpoch())
+                     .InMilliseconds();
+    DCHECK(now >= start);
+    delta = base::TimeDelta::FromMilliseconds(now - start);
+  }
   render_view()->Send(new ChromeViewHostMsg_LogEvent(
       render_view()->GetRoutingID(), page_seq_no_, event, delta));
 }
 
 void SearchBox::LogMostVisitedImpression(int position,
                                          const base::string16& provider) {
   render_view()->Send(new ChromeViewHostMsg_LogMostVisitedImpression(
       render_view()->GetRoutingID(), page_seq_no_, position, provider));
 }
 
@@ skipping 314 matching lines @@
 
 void SearchBox::Reset() {
   query_.clear();
   embedded_search_request_params_ = EmbeddedSearchRequestParams();
   suggestion_ = InstantSuggestion();
   start_margin_ = 0;
   is_focused_ = false;
   is_key_capture_enabled_ = false;
   theme_info_ = ThemeBackgroundInfo();
 }