MD History: update (instead of re-create) data sources on sign in change

chrome/browser/ui/webui/history_ui.cc

 // Copyright (c) 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/browser/ui/webui/history_ui.h"
 
 #include <string>
+#include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/browsing_history_handler.h"
@@ skipping 35 matching lines @@
 const char kIncognitoModeShortcut[] = "("
     "\xE2\x87\xA7"  // Shift symbol (U+21E7 'UPWARDS WHITE ARROW').
     "\xE2\x8C\x98"  // Command symbol (U+2318 'PLACE OF INTEREST SIGN').
     "N)";
 #elif defined(OS_WIN)
 const char kIncognitoModeShortcut[] = "(Ctrl+Shift+N)";
 #else
 const char kIncognitoModeShortcut[] = "(Shift+Ctrl+N)";
 #endif
 
-content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
-  PrefService* prefs = profile->GetPrefs();
+constexpr char kIsUserSignedInKey[] = "isUserSignedIn";
 
+bool IsSignedIn(Profile* profile) {
   // Check if the profile is authenticated.  Guest profiles or incognito
   // windows may not have a sign in manager, and are considered not
   // authenticated.
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
-  bool is_authenticated = signin_manager != nullptr &&
-      signin_manager->IsAuthenticated();
+  return signin_manager && signin_manager->IsAuthenticated();
+}
+
+content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
+  PrefService* prefs = profile->GetPrefs();
 
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIHistoryFrameHost);
-  source->AddBoolean("isUserSignedIn", is_authenticated);
+  source->AddBoolean(kIsUserSignedInKey, IsSignedIn(profile));
 #if !defined(OS_ANDROID)
   source->AddLocalizedString("collapseSessionMenuItemText",
       IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION);
   source->AddLocalizedString("expandSessionMenuItemText",
       IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION);
   source->AddLocalizedString("restoreSessionMenuItemText",
       IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL);
   source->AddLocalizedString("deleteSessionMenuItemText",
       IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW);
 #endif
@@ skipping 79 matching lines @@
   source->SetDefaultResource(IDR_HISTORY_HTML);
   source->DisableDenyXFrameOptions();
   source->DisableI18nAndUseGzipForAllPaths();
 
   return source;
 }
 
 }  // namespace
 
 HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) {
+  // Set up the chrome://history-frame/ source.
+  Profile* profile = Profile::FromWebUI(web_ui);
+  content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile));
+
   web_ui->AddMessageHandler(new BrowsingHistoryHandler());
   web_ui->AddMessageHandler(new MetricsHandler());
 
   // On mobile we deal with foreign sessions differently.
 #if !defined(OS_ANDROID)
   if (search::IsInstantExtendedAPIEnabled()) {
     web_ui->AddMessageHandler(new browser_sync::ForeignSessionHandler());
     web_ui->AddMessageHandler(new HistoryLoginHandler(
-        base::Bind(&HistoryUI::CreateDataSource, base::Unretained(this))));
+        base::Bind(&HistoryUI::UpdateDataSource, base::Unretained(this))));
   }
 #endif
 
   // TODO(crbug.com/595332): Since the API to query other forms of browsing
   // history is not ready yet, make it possible to test the history UI as if
   // it were. If the user opens chrome://history/?reset_ofbh, we will assume
   // that other forms of browsing history exist (for all accounts), and we will
   // also reset the one-time notice shown in the Clear Browsing Data dialog.
   // This code should be removed as soon as the API is ready.
   GURL url = web_ui->GetWebContents()->GetVisibleURL();
   if (url.has_query() && url.query() == "reset_ofbh") {
-    Profile::FromWebUI(web_ui)->GetPrefs()->SetInteger(
+    profile->GetPrefs()->SetInteger(
         browsing_data::prefs::kClearBrowsingDataHistoryNoticeShownTimes, 0);
     browsing_data::testing::
         g_override_other_forms_of_browsing_history_query = true;
   }
-
-  // Set up the chrome://history-frame/ source.
-  CreateDataSource();
 }
 
 HistoryUI::~HistoryUI() {}
 
 // static
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
 }
 
-// TODO(lshang): Change to not re-create data source every time after we use
-// unique_ptr instead of raw pointers for data source.
-void HistoryUI::CreateDataSource() {
+void HistoryUI::UpdateDataSource() {
+  CHECK(web_ui());
   Profile* profile = Profile::FromWebUI(web_ui());
-  content::WebUIDataSource* data_source = CreateHistoryUIHTMLSource(profile);
-  content::WebUIDataSource::Add(profile, data_source);
+  std::unique_ptr<base::DictionaryValue> update(new base::DictionaryValue);
+  update->SetBoolean(kIsUserSignedInKey, IsSignedIn(profile));
+  content::WebUIDataSource::Update(profile, chrome::kChromeUIHistoryFrameHost,
+                                   std::move(update));
 }