Revert "[NTP] Initiate server-side resource requests earlier"

This reverts commit ed15ce53.

Previous change prevented promos and search suggestions from appearing properly.

Required manual resolution for merge conflicts.

Bug: 770640
Change-Id: I37add613a23567d57912623c02441cdb68d261e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1507249
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Reviewed-by: Kristi Park <kristipark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638638}

chrome/browser/resources/local_ntp/local_ntp.js

@@ -129,7 +129,6 @@ var IDS = {
   NOTIFICATION_CLOSE_BUTTON: 'mv-notice-x',
   NOTIFICATION_MESSAGE: 'mv-msg',
   NTP_CONTENTS: 'ntp-contents',
-  OGB: 'one-google',
   PROMO: 'promo',
   RESTORE_ALL_LINK: 'mv-restore',
   SUGGESTIONS: 'suggestions',
@@ -968,15 +967,32 @@ function handlePostMessage(event) {
   if (cmd === 'loaded') {
     tilesAreLoaded = true;
     if (configData.isGooglePage) {
-      // Show search suggestions, promo, and the OGB if they were previously
-      // hidden.
+      // Show search suggestions if they were previously hidden.
       if ($(IDS.SUGGESTIONS)) {
         $(IDS.SUGGESTIONS).style.visibility = 'visible';
       }
-      if ($(IDS.PROMO)) {
-        $(IDS.PROMO).classList.remove(CLASSES.HIDE_PROMO);
+      if (!$('one-google-loader')) {
+        // Load the OneGoogleBar script. It'll create a global variable name
+        // "og" which is a dict corresponding to the native OneGoogleBarData
+        // type. We do this only after all the tiles have loaded, to avoid
+        // slowing down the main page load.
+        var ogScript = document.createElement('script');
+        ogScript.id = 'one-google-loader';
+        ogScript.src = 'chrome-search://local-ntp/one-google.js';
+        document.body.appendChild(ogScript);
+        ogScript.onload = function() {
+          injectOneGoogleBar(og);
+        };
+      }
+      if (!$('promo-loader')) {
+        var promoScript = document.createElement('script');
+        promoScript.id = 'promo-loader';
+        promoScript.src = 'chrome-search://local-ntp/promo.js';
+        document.body.appendChild(promoScript);
+        promoScript.onload = function() {
+          injectPromo(promo);
+        };
       }
-      $(IDS.OGB).classList.remove('hidden');
       $(customBackgrounds.IDS.CUSTOM_LINKS_RESTORE_DEFAULT)
           .classList.toggle(
               customBackgrounds.CLASSES.OPTION_DISABLED,
@@ -1013,15 +1029,11 @@ function handlePostMessage(event) {
   }
 }
 
-/**
- * Request data for search suggestions, promo, and the OGB. Insert it into
- * the page once it's available. For search suggestions this should be almost
- * immediately as cached data is always used. Promos and the OGB may need
- * to wait for the asynchronous network request to complete.
- */
-function requestAndInsertGoogleResources() {
+function showSearchSuggestions() {
+  // Inject search suggestions as early as possible to avoid shifting of other
+  // elements.
   if (!$('search-suggestions-loader')) {
-    let ssScript = document.createElement('script');
+    var ssScript = document.createElement('script');
     ssScript.id = 'search-suggestions-loader';
     ssScript.src = 'chrome-search://local-ntp/search-suggestions.js';
     ssScript.async = false;
@@ -1030,26 +1042,6 @@ function requestAndInsertGoogleResources() {
       injectSearchSuggestions(search_suggestions);
     };
   }
-  if (!$('one-google-loader')) {
-    // Load the OneGoogleBar script. It'll create a global variable |og| which
-    // is a JSON object corresponding to the native OneGoogleBarData type.
-    let ogScript = document.createElement('script');
-    ogScript.id = 'one-google-loader';
-    ogScript.src = 'chrome-search://local-ntp/one-google.js';
-    document.body.appendChild(ogScript);
-    ogScript.onload = function() {
-      injectOneGoogleBar(og);
-    };
-  }
-  if (!$('promo-loader')) {
-    let promoScript = document.createElement('script');
-    promoScript.id = 'promo-loader';
-    promoScript.src = 'chrome-search://local-ntp/promo.js';
-    document.body.appendChild(promoScript);
-    promoScript.onload = function() {
-      injectPromo(promo);
-    };
-  }
 }
 
 
@@ -1115,7 +1107,7 @@ function init() {
   var searchboxApiHandle = embeddedSearchApiHandle.searchBox;
 
   if (configData.isGooglePage) {
-    requestAndInsertGoogleResources();
+    showSearchSuggestions();
     enableMDIcons();
 
     ntpApiHandle.onaddcustomlinkdone = onAddCustomLinkDone;
@@ -1338,7 +1330,6 @@ function injectPromo(promo) {
   let promoContainer = document.createElement('div');
   promoContainer.id = IDS.PROMO;
   promoContainer.innerHTML += promo.promoHtml;
-  promoContainer.classList.add(CLASSES.HIDE_PROMO);
   $(IDS.NTP_CONTENTS).appendChild(promoContainer);
 
   if (promo.promoLogUrl) {
@@ -1375,10 +1366,6 @@ function injectSearchSuggestions(suggestions) {
  * doesn't block the main page load.
  */
 function injectOneGoogleBar(ogb) {
-  if (ogb.barHtml == '') {
-    return;
-  }
-
   var inHeadStyle = document.createElement('style');
   inHeadStyle.type = 'text/css';
   inHeadStyle.appendChild(document.createTextNode(ogb.inHeadStyle));
@@ -1391,8 +1378,9 @@ function injectOneGoogleBar(ogb) {
 
   renderOneGoogleBarTheme();
 
-  var ogElem = $(IDS.OGB);
+  var ogElem = $('one-google');
   ogElem.innerHTML = ogb.barHtml;
+  ogElem.classList.remove('hidden');
 
   var afterBarScript = document.createElement('script');
   afterBarScript.type = 'text/javascript';

chrome/browser/search/local_ntp_source.cc

@@ -367,42 +367,28 @@ base::Value ConvertCollectionImageToDict(
   return images;
 }
 
-scoped_refptr<base::RefCountedString> GetOGBString(
-    const base::Optional<OneGoogleBarData>& og) {
-  base::DictionaryValue dict;
-  if (og.has_value()) {
-    dict.SetString("barHtml", og->bar_html);
-    dict.SetString("inHeadScript", og->in_head_script);
-    dict.SetString("inHeadStyle", og->in_head_style);
-    dict.SetString("afterBarScript", og->after_bar_script);
-    dict.SetString("endOfBodyHtml", og->end_of_body_html);
-    dict.SetString("endOfBodyScript", og->end_of_body_script);
-  } else {
-    dict.SetString("barHtml", std::string());
-  }
-
-  std::string js;
-  base::JSONWriter::Write(dict, &js);
-  js = "var og = " + js + ";";
-  return scoped_refptr<base::RefCountedString>(
-      base::RefCountedString::TakeString(&js));
+std::unique_ptr<base::DictionaryValue> ConvertOGBDataToDict(
+    const OneGoogleBarData& og) {
+  auto result = std::make_unique<base::DictionaryValue>();
+  result->SetString("barHtml", og.bar_html);
+  result->SetString("inHeadScript", og.in_head_script);
+  result->SetString("inHeadStyle", og.in_head_style);
+  result->SetString("afterBarScript", og.after_bar_script);
+  result->SetString("endOfBodyHtml", og.end_of_body_html);
+  result->SetString("endOfBodyScript", og.end_of_body_script);
+  return result;
 }
 
-scoped_refptr<base::RefCountedString> GetPromoString(
+std::unique_ptr<base::DictionaryValue> ConvertPromoDataToDict(
     const base::Optional<PromoData>& promo) {
-  base::DictionaryValue dict;
+  auto result = std::make_unique<base::DictionaryValue>();
   if (promo.has_value()) {
-    dict.SetString("promoHtml", promo->promo_html);
-    dict.SetString("promoLogUrl", promo->promo_log_url.spec());
+    result->SetString("promoHtml", promo->promo_html);
+    result->SetString("promoLogUrl", promo->promo_log_url.spec());
   } else {
-    dict.SetString("promoHtml", std::string());
+    result->SetString("promoHtml", std::string());
   }
-
-  std::string js;
-  base::JSONWriter::Write(dict, &js);
-  js = "var promo = " + js + ";";
-  return scoped_refptr<base::RefCountedString>(
-      base::RefCountedString::TakeString(&js));
+  return result;
 }
 
 std::unique_ptr<base::DictionaryValue> ConvertSearchSuggestDataToDict(
@@ -545,10 +531,6 @@ class LocalNtpSource::SearchConfigurationProvider
     UpdateConfigData();
   }
 
-  bool DefaultSearchProviderIsGoogle() {
-    return search::DefaultSearchProviderIsGoogle(service_);
-  }
-
   ~SearchConfigurationProvider() override {
     if (service_)
       service_->RemoveObserver(this);
@@ -830,32 +812,40 @@ void LocalNtpSource::StartDataRequest(
   if (stripped_path == kOneGoogleBarScriptFilename) {
     if (!one_google_bar_service_) {
       callback.Run(nullptr);
-    } else {
-      ServeOneGoogleBarWhenAvailable(callback);
+      return;
     }
+
+    one_google_bar_requests_.emplace_back(base::TimeTicks::Now(), callback);
+    one_google_bar_service_->Refresh();
+
     return;
   }
 
   if (stripped_path == kPromoScriptFilename) {
     if (!promo_service_) {
       callback.Run(nullptr);
-    } else {
-      ServePromoWhenAvailable(callback);
+      return;
     }
+
+    // TODO(crbug/909931): There's no need to fetch the promo on each load,
+    // we can sometimes use cached data.
+    promo_requests_.emplace_back(base::TimeTicks::Now(), callback);
+    promo_service_->Refresh();
+
     return;
   }
 
-  // Search suggestions always used a cached value, so there is no need to
-  // refresh the data until the old data is used.
   if (stripped_path == kSearchSuggestionsScriptFilename) {
     if (!search_suggest_service_) {
       callback.Run(nullptr);
-    } else {
-      ServeSearchSuggestionsIfAvailable(callback);
-
-      pending_search_suggest_request_ = base::TimeTicks::Now();
-      search_suggest_service_->Refresh();
+      return;
     }
+
+    MaybeServeSearchSuggestions(callback);
+
+    search_suggest_requests_.emplace_back(base::TimeTicks::Now());
+    search_suggest_service_->Refresh();
+
     return;
   }
 
@@ -891,10 +881,6 @@ void LocalNtpSource::StartDataRequest(
 #endif  // !defined(GOOGLE_CHROME_BUILD)
 
   if (stripped_path == kMainHtmlFilename) {
-    if (search_config_provider_->DefaultSearchProviderIsGoogle()) {
-      InitiatePromoAndOGBRequests();
-    }
-
     std::string html = ui::ResourceBundle::GetSharedInstance()
                            .GetRawDataResource(IDR_LOCAL_NTP_HTML)
                            .as_string();
@@ -1150,40 +1136,37 @@ void LocalNtpSource::OnPromoServiceShuttingDown() {
 void LocalNtpSource::OnSearchSuggestDataUpdated() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  if (pending_search_suggest_request_.has_value()) {
-    return;
-  }
-
   SearchSuggestLoader::Status result =
       search_suggest_service_->search_suggest_status();
-  base::TimeDelta delta =
-      base::TimeTicks::Now() - *pending_search_suggest_request_;
-  UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.SearchSuggestions.RequestLatency",
-                             delta);
-  SearchSuggestionsRequestStatus request_status =
-      SearchSuggestionsRequestStatus::UNKNOWN_ERROR;
-
-  if (result == SearchSuggestLoader::Status::SIGNED_OUT) {
-    request_status = SearchSuggestionsRequestStatus::SIGNED_OUT;
-  } else if (result == SearchSuggestLoader::Status::OPTED_OUT) {
-    request_status = SearchSuggestionsRequestStatus::OPTED_OUT;
-  } else if (result == SearchSuggestLoader::Status::IMPRESSION_CAP) {
-    request_status = SearchSuggestionsRequestStatus::IMPRESSION_CAP;
-  } else if (result == SearchSuggestLoader::Status::REQUESTS_FROZEN) {
-    request_status = SearchSuggestionsRequestStatus::FROZEN;
-  } else if (result == SearchSuggestLoader::Status::OK) {
-    request_status = SearchSuggestionsRequestStatus::SENT;
-    UMA_HISTOGRAM_MEDIUM_TIMES(
-        "NewTabPage.SearchSuggestions.RequestLatency.Success", delta);
-  } else if (result == SearchSuggestLoader::Status::FATAL_ERROR) {
-    request_status = SearchSuggestionsRequestStatus::FATAL_ERROR;
-    UMA_HISTOGRAM_MEDIUM_TIMES(
-        "NewTabPage.SearchSuggestions.RequestLatency.Failure", delta);
+  base::TimeTicks now = base::TimeTicks::Now();
+  for (const auto& request : search_suggest_requests_) {
+    base::TimeDelta delta = now - request.start_time;
+    UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.SearchSuggestions.RequestLatency",
+                               delta);
+    SearchSuggestionsRequestStatus request_status =
+        SearchSuggestionsRequestStatus::UNKNOWN_ERROR;
+
+    if (result == SearchSuggestLoader::Status::SIGNED_OUT) {
+      request_status = SearchSuggestionsRequestStatus::SIGNED_OUT;
+    } else if (result == SearchSuggestLoader::Status::OPTED_OUT) {
+      request_status = SearchSuggestionsRequestStatus::OPTED_OUT;
+    } else if (result == SearchSuggestLoader::Status::IMPRESSION_CAP) {
+      request_status = SearchSuggestionsRequestStatus::IMPRESSION_CAP;
+    } else if (result == SearchSuggestLoader::Status::REQUESTS_FROZEN) {
+      request_status = SearchSuggestionsRequestStatus::FROZEN;
+    } else if (result == SearchSuggestLoader::Status::OK) {
+      request_status = SearchSuggestionsRequestStatus::SENT;
+      UMA_HISTOGRAM_MEDIUM_TIMES(
+          "NewTabPage.SearchSuggestions.RequestLatency.Success", delta);
+    } else if (result == SearchSuggestLoader::Status::FATAL_ERROR) {
+      request_status = SearchSuggestionsRequestStatus::FATAL_ERROR;
+      UMA_HISTOGRAM_MEDIUM_TIMES(
+          "NewTabPage.SearchSuggestions.RequestLatency.Failure", delta);
+    }
+    UMA_HISTOGRAM_ENUMERATION("NewTabPage.SearchSuggestions.RequestStatus",
+                              request_status);
   }
-  UMA_HISTOGRAM_ENUMERATION("NewTabPage.SearchSuggestions.RequestStatus",
-                            request_status);
-
-  pending_search_suggest_request_ = base::nullopt;
+  search_suggest_requests_.clear();
 }
 
 void LocalNtpSource::OnSearchSuggestServiceShuttingDown() {
@@ -1192,8 +1175,7 @@ void LocalNtpSource::OnSearchSuggestServiceShuttingDown() {
   search_suggest_service_observer_.RemoveAll();
   search_suggest_service_ = nullptr;
 }
-
-void LocalNtpSource::ServeSearchSuggestionsIfAvailable(
+void LocalNtpSource::MaybeServeSearchSuggestions(
     const content::URLDataSource::GotDataCallback& callback) {
   base::Optional<SearchSuggestData> data =
       search_suggest_service_->search_suggest_data();
@@ -1213,89 +1195,59 @@ void LocalNtpSource::ServeOneGoogleBar(
     const base::Optional<OneGoogleBarData>& data) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  if (!pending_one_google_bar_request_.has_value()) {
+  if (one_google_bar_requests_.empty())
     return;
-  }
 
   scoped_refptr<base::RefCountedString> result;
   if (data.has_value()) {
-    result = GetOGBString(data);
-  }
-
-  base::TimeDelta delta =
-      base::TimeTicks::Now() - *pending_one_google_bar_request_;
-  UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.OneGoogleBar.RequestLatency", delta);
-  if (result) {
-    UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.OneGoogleBar.RequestLatency.Success",
-                               delta);
-  } else {
-    UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.OneGoogleBar.RequestLatency.Failure",
-                               delta);
-  }
-  for (const auto& callback : one_google_bar_callbacks_) {
-    callback.Run(result);
+    std::string js;
+    base::JSONWriter::Write(*ConvertOGBDataToDict(*data), &js);
+    js = "var og = " + js + ";";
+    result = base::RefCountedString::TakeString(&js);
   }
-  pending_one_google_bar_request_ = base::nullopt;
-  one_google_bar_callbacks_.clear();
-}
-
-void LocalNtpSource::ServeOneGoogleBarWhenAvailable(
-    const content::URLDataSource::GotDataCallback& callback) {
-  base::Optional<OneGoogleBarData> data =
-      one_google_bar_service_->one_google_bar_data();
 
-  if (!pending_one_google_bar_request_.has_value()) {
-    callback.Run(GetOGBString(data));
-  } else {
-    one_google_bar_callbacks_.emplace_back(callback);
+  base::TimeTicks now = base::TimeTicks::Now();
+  for (const auto& request : one_google_bar_requests_) {
+    request.callback.Run(result);
+    base::TimeDelta delta = now - request.start_time;
+    UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.OneGoogleBar.RequestLatency", delta);
+    if (result) {
+      UMA_HISTOGRAM_MEDIUM_TIMES(
+          "NewTabPage.OneGoogleBar.RequestLatency.Success", delta);
+    } else {
+      UMA_HISTOGRAM_MEDIUM_TIMES(
+          "NewTabPage.OneGoogleBar.RequestLatency.Failure", delta);
+    }
   }
+  one_google_bar_requests_.clear();
 }
 
 void LocalNtpSource::ServePromo(const base::Optional<PromoData>& data) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  if (!pending_promo_request_.has_value()) {
+  if (promo_requests_.empty())
     return;
-  }
-
-  scoped_refptr<base::RefCountedString> result = GetPromoString(data);
 
-  base::TimeDelta delta = base::TimeTicks::Now() - *pending_promo_request_;
-  UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.Promos.RequestLatency", delta);
-  if (result) {
-    UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.Promos.RequestLatency.Success",
-                               delta);
-  } else {
-    UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.Promos.RequestLatency.Failure",
-                               delta);
-  }
-  for (const auto& callback : promo_callbacks_) {
-    callback.Run(result);
-  }
-  pending_promo_request_ = base::nullopt;
-  promo_callbacks_.clear();
-}
-
-void LocalNtpSource::ServePromoWhenAvailable(
-    const content::URLDataSource::GotDataCallback& callback) {
-  base::Optional<PromoData> data = promo_service_->promo_data();
-
-  if (!pending_promo_request_.has_value()) {
-    callback.Run(GetPromoString(data));
-  } else {
-    promo_callbacks_.emplace_back(callback);
-  }
-}
+  scoped_refptr<base::RefCountedString> result;
+  std::string js;
+  base::JSONWriter::Write(*ConvertPromoDataToDict(data), &js);
+  js = "var promo = " + js + ";";
+  result = base::RefCountedString::TakeString(&js);
 
-void LocalNtpSource::InitiatePromoAndOGBRequests() {
-  if (one_google_bar_service_) {
-    pending_one_google_bar_request_ = base::TimeTicks::Now();
-    one_google_bar_service_->Refresh();
-  }
-  if (promo_service_) {
-    pending_promo_request_ = base::TimeTicks::Now();
-    promo_service_->Refresh();
+  base::TimeTicks now = base::TimeTicks::Now();
+  for (const auto& request : promo_requests_) {
+    request.callback.Run(result);
+    base::TimeDelta delta = now - request.start_time;
+    UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.Promos.RequestLatency", delta);
+    if (result) {
+      UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.Promos.RequestLatency.Success",
+                                 delta);
+    } else {
+      UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.Promos.RequestLatency.Failure",
+                                 delta);
+    }
   }
+  promo_requests_.clear();
 }
 
 LocalNtpSource::NtpBackgroundRequest::NtpBackgroundRequest(
@@ -1307,3 +1259,31 @@ LocalNtpSource::NtpBackgroundRequest::NtpBackgroundRequest(
     const NtpBackgroundRequest&) = default;
 
 LocalNtpSource::NtpBackgroundRequest::~NtpBackgroundRequest() = default;
+
+LocalNtpSource::OneGoogleBarRequest::OneGoogleBarRequest(
+    base::TimeTicks start_time,
+    const content::URLDataSource::GotDataCallback& callback)
+    : start_time(start_time), callback(callback) {}
+
+LocalNtpSource::OneGoogleBarRequest::OneGoogleBarRequest(
+    const OneGoogleBarRequest&) = default;
+
+LocalNtpSource::OneGoogleBarRequest::~OneGoogleBarRequest() = default;
+
+LocalNtpSource::PromoRequest::PromoRequest(
+    base::TimeTicks start_time,
+    const content::URLDataSource::GotDataCallback& callback)
+    : start_time(start_time), callback(callback) {}
+
+LocalNtpSource::PromoRequest::PromoRequest(const PromoRequest&) = default;
+
+LocalNtpSource::PromoRequest::~PromoRequest() = default;
+
+LocalNtpSource::SearchSuggestRequest::SearchSuggestRequest(
+    base::TimeTicks start_time)
+    : start_time(start_time) {}
+
+LocalNtpSource::SearchSuggestRequest::SearchSuggestRequest(
+    const SearchSuggestRequest&) = default;
+
+LocalNtpSource::SearchSuggestRequest::~SearchSuggestRequest() = default;

chrome/browser/search/local_ntp_source.h

@@ -69,6 +69,35 @@ class LocalNtpSource : public content::URLDataSource,
     content::URLDataSource::GotDataCallback callback;
   };
 
+  struct OneGoogleBarRequest {
+    OneGoogleBarRequest(
+        base::TimeTicks start_time,
+        const content::URLDataSource::GotDataCallback& callback);
+    OneGoogleBarRequest(const OneGoogleBarRequest&);
+    ~OneGoogleBarRequest();
+
+    base::TimeTicks start_time;
+    content::URLDataSource::GotDataCallback callback;
+  };
+
+  struct PromoRequest {
+    PromoRequest(base::TimeTicks start_time,
+                 const content::URLDataSource::GotDataCallback& callback);
+    PromoRequest(const PromoRequest&);
+    ~PromoRequest();
+
+    base::TimeTicks start_time;
+    content::URLDataSource::GotDataCallback callback;
+  };
+
+  struct SearchSuggestRequest {
+    explicit SearchSuggestRequest(base::TimeTicks start_time);
+    explicit SearchSuggestRequest(const SearchSuggestRequest&);
+    ~SearchSuggestRequest();
+
+    base::TimeTicks start_time;
+  };
+
   // Overridden from content::URLDataSource:
   std::string GetSource() const override;
   void StartDataRequest(
@@ -102,32 +131,13 @@ class LocalNtpSource : public content::URLDataSource,
   void OnSearchSuggestDataUpdated() override;
   void OnSearchSuggestServiceShuttingDown() override;
 
-  // Called when the OGB data is available and serves |data| to any pending
-  // request from the NTP.
   void ServeOneGoogleBar(const base::Optional<OneGoogleBarData>& data);
-  // Called when the page requests OGB data. If the data is available it
-  // is returned immediately, otherwise it is returned when it becomes available
-  // in ServeOneGoogleBar.
-  void ServeOneGoogleBarWhenAvailable(
-      const content::URLDataSource::GotDataCallback& callback);
 
-  // Called when the promo data is available and serves |data| to any pending
-  // requests from the NTP.
   void ServePromo(const base::Optional<PromoData>& data);
-  // Called when the page requests promo data. If the data is available it
-  // is returned immediately, otherwise it is returned when it becomes
-  // available in ServePromo.
-  void ServePromoWhenAvailable(
-      const content::URLDataSource::GotDataCallback& callback);
 
-  // If suggestion data is available return it immediately, otherwise no search
-  // suggestions will be shown on this NTP load.
-  void ServeSearchSuggestionsIfAvailable(
+  void MaybeServeSearchSuggestions(
       const content::URLDataSource::GotDataCallback& callback);
 
-  // Start requests for the promo and OGB.
-  void InitiatePromoAndOGBRequests();
-
   Profile* const profile_;
 
   std::vector<NtpBackgroundRequest> ntp_background_collections_requests_;
@@ -138,23 +148,20 @@ class LocalNtpSource : public content::URLDataSource,
   ScopedObserver<NtpBackgroundService, NtpBackgroundServiceObserver>
       ntp_background_service_observer_;
 
-  base::Optional<base::TimeTicks> pending_one_google_bar_request_;
-  std::vector<content::URLDataSource::GotDataCallback>
-      one_google_bar_callbacks_;
+  std::vector<OneGoogleBarRequest> one_google_bar_requests_;
 
   OneGoogleBarService* one_google_bar_service_;
 
   ScopedObserver<OneGoogleBarService, OneGoogleBarServiceObserver>
       one_google_bar_service_observer_;
 
-  base::Optional<base::TimeTicks> pending_promo_request_;
-  std::vector<content::URLDataSource::GotDataCallback> promo_callbacks_;
+  std::vector<PromoRequest> promo_requests_;
 
   PromoService* promo_service_;
 
   ScopedObserver<PromoService, PromoServiceObserver> promo_service_observer_;
 
-  base::Optional<base::TimeTicks> pending_search_suggest_request_;
+  std::vector<SearchSuggestRequest> search_suggest_requests_;
 
   SearchSuggestService* search_suggest_service_;