Separate handler initialization from page initialization

chrome/browser/ui/webui/options2/autofill_options_handler2.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/options2/autofill_options_handler2.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 286 matching lines @@
                 IDS_AUTOFILL_OPTIONS_TITLE);
 
   localized_strings->SetString("helpUrl", chrome::kAutofillHelpURL);
   SetAddressOverlayStrings(localized_strings);
   SetCreditCardOverlayStrings(localized_strings);
 }
 
 void AutofillOptionsHandler::InitializeHandler() {
   personal_data_ = PersonalDataManagerFactory::GetForProfile(
       Profile::FromWebUI(web_ui()));
-  // personal_data_ is NULL in guest mode on Chrome OS.
-  if (personal_data_)
-    personal_data_->SetObserver(this);
 }
 
 void AutofillOptionsHandler::InitializePage() {
-  if (personal_data_)
+  // personal_data_ is NULL in guest mode on Chrome OS.
+  if (personal_data_) {
+    personal_data_->SetObserver(this);
     LoadAutofillData();
+  }
 }
 
 void AutofillOptionsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "removeAddress",
       base::Bind(&AutofillOptionsHandler::RemoveAddress,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "removeCreditCard",
       base::Bind(&AutofillOptionsHandler::RemoveCreditCard,
@@ skipping 290 matching lines @@
     return;
 
   ListValue* list_value = NULL;
   ValidatePhoneArguments(args, &list_value);
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 }  // namespace options2