Fix metadata loss when revalidating search provider logo.

components/search_provider_logos/google_logo_api.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 "components/search_provider_logos/google_logo_api.h"
 
 #include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_util.h"
@@ skipping 76 matching lines @@
   std::string encoded_image_base64;
   if (logo_dict->GetString("data", &encoded_image_base64)) {
     // Data is optional, since we may be revalidating a cached logo.
     base::RefCountedString* encoded_image_string = new base::RefCountedString();
     if (!base::Base64Decode(encoded_image_base64,
                             &encoded_image_string->data()))
       return scoped_ptr<EncodedLogo>();
     logo->encoded_image = encoded_image_string;
     if (!logo_dict->GetString("mime_type", &logo->metadata.mime_type))
       return scoped_ptr<EncodedLogo>();
-
-    // Existance of url indicates |data| is a call to action image for an
-    // animated doodle. |url| points to that animated doodle.
-    logo_dict->GetString("url", &logo->metadata.animated_url);
   }
 
   // Don't check return values since these fields are optional.
   logo_dict->GetString("target", &logo->metadata.on_click_url);
   logo_dict->GetString("fingerprint", &logo->metadata.fingerprint);
   logo_dict->GetString("alt", &logo->metadata.alt_text);
 
+  // Existance of url indicates |data| is a call to action image for an
+  // animated doodle. |url| points to that animated doodle.
+  logo_dict->GetString("url", &logo->metadata.animated_url);
+
   base::TimeDelta time_to_live;
   int time_to_live_ms;
   if (logo_dict->GetInteger("time_to_live", &time_to_live_ms)) {
     time_to_live = base::TimeDelta::FromMilliseconds(
         std::min(static_cast<int64>(time_to_live_ms), kMaxTimeToLiveMS));
     logo->metadata.can_show_after_expiration = false;
   } else {
     time_to_live = base::TimeDelta::FromMilliseconds(kMaxTimeToLiveMS);
     logo->metadata.can_show_after_expiration = true;
   }
   logo->metadata.expiration_time = response_time + time_to_live;
 
   return logo.Pass();
 }
 
 }  // namespace search_provider_logos