Refactor install.cc into the work item parts and the non-work item parts.

chrome/installer/util/installation_state.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
 #define CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 37 matching lines @@
 // Encapsulates the state of all products on the system.
 class InstallationState {
  public:
   InstallationState();
 
   // Initializes |this| with the machine's current state.
   void Initialize(const MasterPreferences& prefs);
 
   // Returns the state of the multi-installer package or NULL if no
   // multi-install products are installed.
+  // Caller does NOT assume ownership of returned pointer.

[tommi (sloooow) - chröme, 2011/01/12 19:02:49]

since the returned pointer is const, I presume you can't delete it anyway so the
comment isn't necessary

[grt (UTC plus 2), 2011/01/12 19:23:57]

C++-03 5.3.5.2: Note: a pointer to a const type can be the operand of a
delete-expression; it is not necessary to cast away the constness (5.2.11) of
the pointer expression before it is used as the operand of the
delete-expression.

[robertshield, 2011/01/13 17:06:32]

Done.

[robertshield, 2011/01/13 17:06:32]

What Greg said ;-)

   const ProductState* GetMultiPackageState(bool system_install) const;
 
-  // Sets the state of the multi-installer package; intended for tests.
-  void SetMultiPackageState(bool system_install,
-                            const ProductState& package_state);
-
   // Returns the state of a product or NULL if not installed.
+  // Caller does NOT assume ownership of returned pointer.

[tommi (sloooow) - chröme, 2011/01/12 19:02:49]

same here

[robertshield, 2011/01/13 17:06:32]

Done.

   const ProductState* GetProductState(bool system_install,
                                       BrowserDistribution::Type type) const;
 
-  // Sets the state of a product; indended for tests.
-  void SetProductState(bool system_install,
-                       BrowserDistribution::Type type,
-                       const ProductState& product_state);
-
- private:
+ protected:
   enum {
     CHROME_BROWSER_INDEX,
     CHROME_FRAME_INDEX,
     MULTI_PACKAGE_INDEX,
     NUM_PRODUCTS
   };
 
   static int IndexFromDistType(BrowserDistribution::Type type);
   static void InitializeProduct(bool system_install,
                                 BrowserDistribution* distribution,
                                 ProductState* product);
   static void InitializeMultiPackage(bool system_install,
                                      PackageProperties& properties,
                                      ProductState* product);
 
   ProductState user_products_[NUM_PRODUCTS];
   ProductState system_products_[NUM_PRODUCTS];
 

[grt (UTC plus 2), 2011/01/12 16:18:02]

 private:

[robertshield, 2011/01/13 17:06:32]

oops, done, thanks :-)

   DISALLOW_COPY_AND_ASSIGN(InstallationState);
 };  // class InstallationState
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_