Revert "Change mini_installer's chrome.release specification..."

This reverts r11864 - it broke the tree.


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

3 files changed, 3 insertions, 58 deletions

diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index d872335..e6c51dd 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -12,14 +12,10 @@
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/work_item.h"
 
-// Build-time generated include file.
-#include "registered_dlls.h"
-
 namespace {
 std::wstring AppendPath(const std::wstring parent_path,
                         const std::wstring path) {
@@ -115,6 +111,7 @@ void AddInstallerCopyTasks(const std::wstring& exe_path,
   install_list->AddMoveTreeWorkItem(archive_path, archive_dst, temp_path);
 }
 
+
 // This method tells if we are running on 64 bit platform so that we can copy
 // one extra exe. If the API call to determine 64 bit fails, we play it safe
 // and return true anyway so that the executable can be copied.
@@ -133,7 +130,7 @@ bool Is64bit() {
   return false;
 }
 
-}  // namespace
+}
 
 bool installer::InstallNewVersion(const std::wstring& exe_path,
                                   const std::wstring& archive_path,
@@ -142,6 +139,7 @@ bool installer::InstallNewVersion(const std::wstring& exe_path,
                                   const std::wstring& temp_dir,
                                   const HKEY reg_root,
                                   const Version& new_version) {
+
   if (reg_root != HKEY_LOCAL_MACHINE && reg_root != HKEY_CURRENT_USER)
     return false;
 
@@ -270,33 +268,6 @@ bool installer::InstallNewVersion(const std::wstring& exe_path,
     }
   }
 
-  // Now we need to register any self registering components and unregister
-  // any that were left from the old version that is being upgraded:
-  if (!current_version.empty()) {
-    std::wstring old_dll_path(install_path);
-    file_util::AppendToPath(&old_dll_path, current_version);
-    scoped_ptr<WorkItemList> old_dll_list(WorkItem::CreateWorkItemList());
-    if (InstallUtil::BuildDLLRegistrationList(old_dll_path, kDllsToRegister,
-                                              kNumDllsToRegister, false,
-                                              old_dll_list.get())) {
-      // Don't abort the install as a result of a failure to unregister old
-      // DLLs.
-      old_dll_list->Do();
-    }
-  }
-
-  std::wstring dll_path(install_path);
-  file_util::AppendToPath(&dll_path, new_version.GetString());
-  scoped_ptr<WorkItemList> dll_list(WorkItem::CreateWorkItemList());
-  if (InstallUtil::BuildDLLRegistrationList(dll_path, kDllsToRegister,
-                                            kNumDllsToRegister, true,
-                                            dll_list.get())) {
-    success = dll_list->Do();
-    if (!success) {
-      dll_list->Rollback();
-    }
-  }
-
   if (!success) {
     LOG(ERROR) << "Install failed, rolling back... ";
     install_list->Rollback();
diff --git a/chrome/installer/setup/setup.vcproj b/chrome/installer/setup/setup.vcproj
index d0e6176..72cdcad 100644
--- a/chrome/installer/setup/setup.vcproj
+++ b/chrome/installer/setup/setup.vcproj
@@ -16,9 +16,6 @@
 		<ToolFile
 			RelativePath="..\..\tools\build\win\version.rules"
 		/>
-		<ToolFile
-			RelativePath="..\..\tools\build\win\server.rules"
-		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
@@ -30,10 +27,6 @@
 				Name="Version"
 			/>
 			<Tool
-				Name="Scan Server DLLs"
-				CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\scan_server_dlls.py --output_dir=&quot;$(OutDir)&quot; --input_file=&quot;$(InputPath)&quot; --header_output_dir=&quot;$(IntDir)&quot; --distribution=$(CHROMIUM_BUILD)"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 			/>
 			<Tool
@@ -92,10 +85,6 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\mini_installer\chrome.release"
-			>
-		</File>
-		<File
 			RelativePath=".\install.cc"
 			>
 		</File>
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index e2ec9d18..2fb0815 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -17,15 +17,11 @@
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
-#include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/logging_installer.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/version.h"
 
-// Build-time generated include file.
-#include "registered_dlls.h"
-
 namespace {
 
 // This functions checks for any Chrome instances that are
@@ -285,17 +281,6 @@ installer_util::InstallStatus installer_setup::UninstallChrome(
     file_util::AppendToPath(&reg_path, installer_util::kChromeExe);
     DeleteRegistryKey(hklm_key, reg_path);
     hklm_key.Close();
-
-    // Unregister any dll servers that we may have registered.
-    std::wstring dll_path(installer::GetChromeInstallPath(system_uninstall));
-    file_util::AppendToPath(&dll_path, installed_version.GetString());
-
-    scoped_ptr<WorkItemList> dll_list(WorkItem::CreateWorkItemList());
-    if (InstallUtil::BuildDLLRegistrationList(dll_path, kDllsToRegister,
-                                              kNumDllsToRegister, false,
-                                              dll_list.get())) {
-      dll_list->Do();
-    }
   }
 
   // Finally delete all the files from Chrome folder after moving setup.exe