Remove the Chrome Frame preprocessor define in chrome_constants.cc

chrome/installer/setup/uninstall.cc

 // 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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 158 matching lines @@
   file_util::AppendToPath(&setup_exe, file_util::GetFilenameFromPath(exe_path));
 
   FilePath temp_file;
   if (!file_util::CreateTemporaryFile(&temp_file)) {
     LOG(ERROR) << "Failed to create temporary file for setup.exe.";
   } else {
     FilePath setup_exe_path = FilePath::FromWStringHack(setup_exe);
     file_util::Move(setup_exe_path, temp_file);
   }
 
+  // Obtain the location of the user profile data. Chrome Frame needs to
+  // build this path manually since it doesn't use the Chrome default dir.
+  FilePath user_local_state;
+#if defined(CHROME_FRAME_BUILD)
+  bool got_local_state =
+      chrome::GetChromeFrameUserDataDirectory(&user_local_state);
+#else  // if !defined(CHROME_FRAME_BUILD)
+  bool got_local_state = chrome::GetDefaultUserDataDirectory(&user_local_state);
+#endif
+
   // Move the browser's persisted local state
-  FilePath user_local_state;
-  if (chrome::GetDefaultUserDataDirectory(&user_local_state)) {
+  if (got_local_state) {
     FilePath user_local_file(
         user_local_state.Append(chrome::kLocalStateFilename));
-
     FilePath path = FilePath::FromWStringHack(*local_state_path);
     if (!file_util::CreateTemporaryFile(&path))
       LOG(ERROR) << "Failed to create temporary file for Local State.";
     else
       file_util::CopyFile(user_local_file, path);
+  } else {
+    LOG(ERROR) << "Could not retrieve user's profile directory.";
   }
 
   DeleteResult result = DELETE_SUCCEEDED;
 
   LOG(INFO) << "Deleting install path " << install_path;
   if (!file_util::Delete(install_path, true)) {
     LOG(ERROR) << "Failed to delete folder (1st try): " << install_path;
 #if defined(CHROME_FRAME_BUILD)
     // We don't try killing Chrome processes for Chrome Frame builds since
     // that is unlikely to help. Instead, schedule files for deletion and
     // return a value that will trigger a reboot prompt.
     ScheduleDirectoryForDeletion(install_path.c_str());
     result = DELETE_REQUIRES_REBOOT;
 #else
     // Try closing any running chrome processes and deleting files once again.
     CloseAllChromeProcesses();
     if (!file_util::Delete(install_path, true)) {
       LOG(ERROR) << "Failed to delete folder (2nd try): " << install_path;
       result = DELETE_FAILED;
     }
 #endif
   }
 
-  if (delete_profile) {
+  if (delete_profile && got_local_state) {
     LOG(INFO) << "Deleting user profile" << user_local_state.value();
     if (!file_util::Delete(user_local_state, true)) {
       LOG(ERROR) << "Failed to delete user profile dir: "
                  << user_local_state.value();
 #if defined(CHROME_FRAME_BUILD)
       ScheduleDirectoryForDeletion(user_local_state.value().c_str());
       result = DELETE_REQUIRES_REBOOT;
 #else
       result = DELETE_FAILED;
 #endif
@@ skipping 290 matching lines @@
     dist->DoPostUninstallOperations(*installed_version, local_state_path,
                                     distribution_data);
   }
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!local_state_path.empty())
     file_util::Delete(local_state_path, false);
 
   return ret;
-}
+}