Add crash keys for the installer covering simple InstallerState fields.

chrome/installer/util/installer_state.h

 // Copyright (c) 2012 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_INSTALLER_STATE_H_
 #define CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "base/strings/string16.h"
 #include "base/version.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/product.h"
 #include "chrome/installer/util/util_constants.h"
 
 #if defined(OS_WIN)
 #include <windows.h>  // NOLINT
 #endif
 
 namespace base {
@@ skipping 73 matching lines @@
   // The level (user or system) of this operation.
   Level level() const { return level_; }
 
   // The package type (single or multi) of this operation.
   PackageType package_type() const { return package_type_; }
 
   // An identifier of this operation.
   Operation operation() const { return operation_; }
 
   // A convenience method returning level() == SYSTEM_LEVEL.
-  // TODO(grt): Eradicate the bool in favor of the enum.
   bool system_install() const;
 
   // A convenience method returning package_type() == MULTI_PACKAGE.
-  // TODO(grt): Eradicate the bool in favor of the enum.
   bool is_multi_install() const;
 
   // The full path to the place where the operand resides.
   const base::FilePath& target_path() const { return target_path_; }
 
   // True if the "msi" preference is set or if a product with the "msi" state
   // flag is set is to be operated on.
   bool is_msi() const { return msi_; }
 
   // True if the --verbose-logging command-line flag is set or if the
   // verbose_logging master preferences option is true.
   bool verbose_logging() const { return verbose_logging_; }
 
 #if defined(OS_WIN)
   HKEY root_key() const { return root_key_; }
 #endif
 
   // The ClientState key by which we interact with Google Update.
-  const std::wstring& state_key() const { return state_key_; }
+  const base::string16& state_key() const { return state_key_; }
 
   // Convenience method to return the type of the BrowserDistribution associated
   // with the ClientState key we will be interacting with.
   BrowserDistribution::Type state_type() const { return state_type_; }
 
   // Returns the BrowserDistribution instance corresponding to the binaries for
   // this run if we're operating on a multi-package product.
   BrowserDistribution* multi_package_binaries_distribution() const {
     DCHECK(package_type_ == MULTI_PACKAGE);
     DCHECK(multi_package_distribution_ != NULL);
@@ skipping 104 matching lines @@
 
   // Sets this object's level and updates the root_key_ accordingly.
   void set_level(Level level);
 
   // Sets this object's package type and updates the multi_package_distribution_
   // accordingly.
   void set_package_type(PackageType type);
 
   Operation operation_;
   base::FilePath target_path_;
-  std::wstring state_key_;
+  base::string16 state_key_;
   BrowserDistribution::Type state_type_;
   ScopedVector<Product> products_;
   BrowserDistribution* multi_package_distribution_;
   base::Version critical_update_version_;
   Level level_;
   PackageType package_type_;
 #if defined(OS_WIN)
   HKEY root_key_;
 #endif
   bool msi_;
   bool verbose_logging_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallerState);
 };  // class InstallerState
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_