Fix Chrome crashes when opening settings in guest mode on Chrome OS.

Along the way, hide the autofill options in guest mode as it does not
make sense for a guest user.

TEST=confirm that crash is fixed and the autofil options are hidden for the guest user on chrome os
BUG=chromium-os:20846


Review URL: http://codereview.chromium.org/8050026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103052 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 4 deletions

diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index 0ab4e20..8c1c58c 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -81,7 +81,7 @@
         </div>
       </div>
     </section>
-    <section>
+    <section id="autofill-section">
       <h3 i18n-content="autofill"></h3>
       <div>
         <div class="checkbox">
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 5c2e382..c09b787 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -91,6 +91,10 @@ cr.define('options', function() {
         chrome.send('coreOptionsUserMetricsAction',
             ['Options_ShowAutofillSettings']);
       };
+      if (cr.isChromeOS && cr.commandLine.options['--bwsi']) {
+        // Hide Autofill options for the guest user.
+        $('autofill-section').hidden = true;
+      }
 
       // Appearance.
       $('themes-reset').onclick = function(event) {
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index f7004ef..1537b28 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -284,9 +284,11 @@ void AutofillOptionsHandler::GetLocalizedValues(
 void AutofillOptionsHandler::Initialize() {
   personal_data_ = PersonalDataManagerFactory::GetForProfile(
       Profile::FromWebUI(web_ui_));
-  personal_data_->SetObserver(this);
-
-  LoadAutofillData();
+  // personal_data_ is NULL in guest mode on Chrome OS.
+  if (personal_data_) {
+    personal_data_->SetObserver(this);
+    LoadAutofillData();
+  }
 }
 
 void AutofillOptionsHandler::RegisterMessages() {