Record NTP.LogoShownTime for timely refreshs only

chrome/browser/android/logo_bridge.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 "chrome/browser/android/logo_bridge.h"
 
 #include <jni.h>
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
@@ skipping 202 matching lines @@
   animated_logo_fetcher_ = base::MakeUnique<AnimatedLogoFetcher>(
       profile->GetRequestContext());
 }
 
 LogoBridge::~LogoBridge() {}
 
 void LogoBridge::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
-void LogoBridge::GetCurrentLogo(JNIEnv* env,
-                                const JavaParamRef<jobject>& obj,
-                                const JavaParamRef<jobject>& j_logo_observer) {
+void LogoBridge::GetCurrentLogo(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jobject>& j_logo_observer,
+    const JavaParamRef<jobject>& j_refresh_skipped_callback) {
   if (doodle_service_) {
     j_logo_observer_.Reset(j_logo_observer);
 
     // Immediately hand out any current cached config.
     DoodleConfigReceived(doodle_service_->config(), /*from_cache=*/true);

[Marc Treib, 2017/04/26 10:17:16]

Ah, here's the problem I'm talking about above, and I see that the comment here
is misleading: This won't usually call onLogoAvailable immediately, since it
first has to fetch the actual image.

[fhorschig, 2017/04/27 10:31:44]

OnLogoAvailable is now exactly called when
a) we have a config (called with doodle).
b) we will not receive a config (called with null).

     // Also request a refresh, in case something changed.
-    doodle_service_->Refresh();
+    if (!doodle_service_->Refresh()) {
+      // If the request was skipped, tell the observer not to wait for
+      // notification. This ensures that metrics recording accounts for that.
+      Java_LogoRefreshCallback_onRefreshSkipped(env,
+                                                j_refresh_skipped_callback);
+    }
   } else {
     // |observer| is deleted in LogoObserverAndroid::OnObserverRemoved().
     LogoObserverAndroid* observer = new LogoObserverAndroid(
         weak_ptr_factory_.GetWeakPtr(), env, j_logo_observer);
     logo_service_->GetLogo(observer);
   }
 }
 
 void LogoBridge::GetAnimatedLogo(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
@@ skipping 65 matching lines @@
   ScopedJavaLocalRef<jobject> j_logo = MakeJavaLogo(
       env, image.ToSkBitmap(), on_click_url, alt_text, animated_image_url);
   Java_LogoObserver_onLogoAvailable(env, j_logo_observer_, j_logo,
                                     config_from_cache);
 }
 
 // static
 bool RegisterLogoBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }