Make kCookiePromptExpanded a profile pref rather than a local state pref so it can be synced.

chrome/browser/cookie_modal_dialog_gtk.cc

 // Copyright (c) 2010 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/cookie_modal_dialog.h"
 
 #include "app/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/gtk/gtk_chrome_cookie_view.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/pref_service.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/views/cookie_prompt_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
-namespace {
-
-void OnExpanderActivate(GtkExpander* expander) {
-  g_browser_process->local_state()->
-      SetBoolean(prefs::kCookiePromptExpanded,
-                 gtk_expander_get_expanded(GTK_EXPANDER(expander)));
-}
-
-}  // namespace
-
 void CookiePromptModalDialog::CreateAndShowDialog() {
   dialog_ = CreateNativeDialog();
   gtk_util::ShowModalDialogWithMinLocalizedWidth(GTK_WIDGET(dialog_),
       IDS_ALERT_DIALOG_WIDTH_CHARS);
 }
 
 void CookiePromptModalDialog::AcceptWindow() {
   HandleDialogResponse(GTK_DIALOG(dialog_), GTK_RESPONSE_ACCEPT);
 }
 
@@ skipping 42 matching lines @@
   GtkWidget* ask_radio = gtk_radio_button_new_with_label_from_widget(
       GTK_RADIO_BUTTON(remember_radio_),
       l10n_util::GetStringUTF8(IDS_COOKIE_ALERT_ASK_RADIO).c_str());
   gtk_box_pack_start(GTK_BOX(radio_box), ask_radio, FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(content_area), radio_box, FALSE, FALSE, 0);
 
   GtkWidget* expander = gtk_expander_new(
       l10n_util::GetStringUTF8(IDS_COOKIE_SHOW_DETAILS_LABEL).c_str());
   gtk_expander_set_expanded(GTK_EXPANDER(expander),
-                            g_browser_process->local_state()->
+                            tab_contents_->profile()->GetPrefs()->
                             GetBoolean(prefs::kCookiePromptExpanded));
   g_signal_connect(expander, "notify::expanded",
-                   G_CALLBACK(OnExpanderActivate), NULL);
-
+                   G_CALLBACK(OnExpanderActivateThunk), this);
   cookie_view_ = gtk_chrome_cookie_view_new(TRUE);
   gtk_chrome_cookie_view_clear(GTK_CHROME_COOKIE_VIEW(cookie_view_));
   if (type == CookiePromptModalDialog::DIALOG_TYPE_COOKIE) {
     gtk_chrome_cookie_view_display_cookie_string(
         GTK_CHROME_COOKIE_VIEW(cookie_view_),
         origin(), cookie_line());
   } else if (type == CookiePromptModalDialog::DIALOG_TYPE_LOCAL_STORAGE) {
     gtk_chrome_cookie_view_display_local_storage_item(
         GTK_CHROME_COOKIE_VIEW(cookie_view_),
         origin().host(),
@@ skipping 39 matching lines @@
   } else {
     BlockSiteData(false);
   }
   gtk_widget_destroy(GTK_WIDGET(dialog));
 
   CompleteDialog();
 
   gtk_util::AppModalDismissedUngroupWindows();
   delete this;
 }
+
+void CookiePromptModalDialog::OnExpanderActivate(GtkWidget* expander,
+                                                 GParamSpec* property) {
+  tab_contents_->profile()->GetPrefs()->
+      SetBoolean(prefs::kCookiePromptExpanded,
+                 gtk_expander_get_expanded(GTK_EXPANDER(expander)));
+}