Reenable nacl_ui_tests on Windows + fix win64 issue.

Some functions in master_preferences_dummy.cc are now called but they are still not relevant for the 64-bit binary.
BUG=44371


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

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

1 files changed, 5 insertions, 3 deletions

diff --git a/chrome/installer/util/master_preferences_dummy.cc b/chrome/installer/util/master_preferences_dummy.cc
index 9abd037..3e1fb81 100644
--- a/chrome/installer/util/master_preferences_dummy.cc
+++ b/chrome/installer/util/master_preferences_dummy.cc
@@ -20,7 +20,8 @@ namespace installer_util {
 bool GetDistroBooleanPreference(const DictionaryValue* prefs,
                                 const std::wstring& name,
                                 bool* value) {
-  NOTREACHED();
+  // This function is called by InstallUtil::IsChromeFrameProcess()
+  // We return false because GetInstallPreferences returns an empty value below.
   return false;
 }
 
@@ -32,8 +33,9 @@ bool GetDistroIntegerPreference(const DictionaryValue* prefs,
 }
 
 DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line) {
-  NOTREACHED();
-  return NULL;
+  // This function is called by InstallUtil::IsChromeFrameProcess()
+  // so we cannot make it NOTREACHED()
+  return new DictionaryValue();;
 }
 
 DictionaryValue* ParseDistributionPreferences(