SuggestionsService: implement SyncServiceObserver

chrome/browser/search/suggestions/suggestions_source.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/search/suggestions/suggestions_source.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/barrier_closure.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "components/suggestions/suggestions_service.h"
-#include "components/suggestions/suggestions_utils.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 namespace suggestions {
 
 namespace {
 
@@ skipping 76 matching lines @@
 
 std::string SuggestionsSource::GetSource() const {
   return chrome::kChromeUISuggestionsHost;
 }
 
 void SuggestionsSource::StartDataRequest(
     const std::string& path, int render_process_id, int render_frame_id,
     const content::URLDataSource::GotDataCallback& callback) {
   SuggestionsService* suggestions_service =
       SuggestionsServiceFactory::GetForProfile(profile_);
-
-  if (!suggestions_service) {
-    callback.Run(NULL);
-    return;
-  }
-
-  // Since it's a debugging page, it's fine to specify that sync state is
-  // initialized.
-  suggestions_service->FetchSuggestionsData(
-      INITIALIZED_ENABLED_HISTORY,
-      base::Bind(&SuggestionsSource::OnSuggestionsAvailable,
-                 weak_ptr_factory_.GetWeakPtr(), callback));
+  OnSuggestionsAvailable(callback,
+                         suggestions_service->GetSuggestionsDataFromCache());
+  suggestions_service->FetchSuggestionsData();
 }
 
 std::string SuggestionsSource::GetMimeType(const std::string& path) const {
   return "text/html";
 }
 
 base::MessageLoop* SuggestionsSource::MessageLoopForRequestPath(
     const std::string& path) const {
   // This can be accessed from the IO thread.
   return content::URLDataSource::MessageLoopForRequestPath(path);
@@ skipping 47 matching lines @@
     std::string encoded_output;
     base::Base64Encode(std::string(output.begin(), output.end()),
                        &encoded_output);
     context->base64_encoded_pngs[url] = "data:image/png;base64,";
     context->base64_encoded_pngs[url] += encoded_output;
   }
   barrier.Run();
 }
 
 }  // namespace suggestions