Revert 46424 - AutoFill profile shouldn't be saved when cancelled during init...

chrome/browser/cocoa/preferences_window_controller.h

 // Copyright (c) 2009 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/pref_member.h"
 
 namespace PreferencesWindowControllerInternal {
+class PersonalDataManagerObserver;
 class PrefObserverBridge;
 }
 
 @class CustomHomePagesModel;
 @class FontLanguageSettingsController;
 class PrefService;
 class Profile;
 class ProfileSyncService;
 @class SearchEngineListModel;
 
@@ skipping 54 matching lines @@
   StringPrefMember homepage_;
   BooleanPrefMember showHomeButton_;
   BooleanPrefMember showPageOptionButtons_;
   scoped_nsobject<SearchEngineListModel> searchEngineModel_;
   // Used when creating a new home page url to make the new cell editable.
   BOOL pendingSelectForEdit_;
 
   // User Data panel
   BooleanPrefMember askSavePasswords_;
   BooleanPrefMember formAutofill_;
+  // Manages PersonalDataManager loading.
+  scoped_ptr<PreferencesWindowControllerInternal::PersonalDataManagerObserver>
+      personalDataManagerObserver_;
   IBOutlet NSButton* autoFillSettingsButton_;
   IBOutlet NSButton* syncButton_;
   IBOutlet NSButton* syncCustomizeButton_;
   IBOutlet NSTextField* syncStatus_;
   IBOutlet NSButton* syncLink_;
   scoped_nsobject<NSColor> syncStatusNoErrorBackgroundColor_;
   scoped_nsobject<NSColor> syncLinkNoErrorBackgroundColor_;
   scoped_nsobject<NSColor> syncErrorBackgroundColor_;
 
   // Under the hood panel
@@ skipping 80 matching lines @@
 // Returns the (normalized) page corresponding to the given toolbar item.
 // Should be called only after awakeFromNib is.
 - (OptionsPage)getPageForToolbarItem:(NSToolbarItem*)toolbarItem;
 
 // Returns the view corresponding to the given page.  Should be called
 // only after awakeFromNib is.
 - (NSView*)getPrefsViewForPage:(OptionsPage)page;
 
 @end