Moving GoogleUpdateSettings to util. Installer as well as Chrome needs these settings.

BUG=1296800


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

4 files changed, 3 insertions, 151 deletions

diff --git a/chrome/app/breakpad.cc b/chrome/app/breakpad.cc
index bd66618..51e4950 100644
--- a/chrome/app/breakpad.cc
+++ b/chrome/app/breakpad.cc
@@ -41,8 +41,8 @@
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "chrome/app/google_update_client.h"
-#include "chrome/app/google_update_settings.h"
 #include "chrome/common/env_vars.h"
+#include "chrome/installer/util/google_update_settings.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 
 namespace {
diff --git a/chrome/app/chrome_exe.vcproj b/chrome/app/chrome_exe.vcproj
index 321814d..a41ff41 100644
--- a/chrome/app/chrome_exe.vcproj
+++ b/chrome/app/chrome_exe.vcproj
@@ -21,7 +21,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\chrome_exe.vsprops;$(SolutionDir)..\build\debug.vsprops"
+			InheritedPropertySheets=".\chrome_exe.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\chrome\installer\util\using_util.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -88,7 +88,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\chrome_exe.vsprops;$(SolutionDir)..\build\release.vsprops"
+			InheritedPropertySheets=".\chrome_exe.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\chrome\installer\util\using_util.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -213,14 +213,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\google_update_settings.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\google_update_settings.h"
-			>
-		</File>
-		<File
 			RelativePath=".\result_codes.h"
 			>
 		</File>
diff --git a/chrome/app/google_update_settings.cc b/chrome/app/google_update_settings.cc
deleted file mode 100644
index eb8eb4a..0000000
--- a/chrome/app/google_update_settings.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "chrome/app/google_update_settings.h"
-
-#include "base/registry.h"
-
-namespace {
-
-const wchar_t kRegistryBase[] =
-    L"Software\\Google\\Update\\ClientState\\{8A69D345-D564-463c-AFF1-A69D9E530F96}";
-const wchar_t kUsageStatsFlag[] = L"usagestats";
-const wchar_t kBrowserUsed[] = L"browser";
-const wchar_t kSelectedLang[] = L"lang";
-const wchar_t kRLZBrand[] = L"brand";
-
-}  // namespace
-
-bool GoogleUpdateSettings::GetCollectStatsConsent() {
-  RegKey key(HKEY_CURRENT_USER, kRegistryBase, KEY_READ);
-  DWORD value;
-  if (!key.ReadValueDW(kUsageStatsFlag, &value))
-    return false;
-  return (1 == value);
-}
-
-bool GoogleUpdateSettings::SetCollectStatsConsent(bool consented) {
-  RegKey key(HKEY_CURRENT_USER, kRegistryBase, KEY_READ | KEY_WRITE);
-  DWORD value = consented ? 1 : 0;
-  return key.WriteValue(kUsageStatsFlag, value);
-}
-
-bool GoogleUpdateSettings::GetBrowser(std::wstring* browser) {
-  RegKey key(HKEY_CURRENT_USER, kRegistryBase, KEY_READ);
-  return key.ReadValue(kBrowserUsed, browser);
-}
-
-bool GoogleUpdateSettings::GetLanguage(std::wstring* language) {
-  RegKey key(HKEY_CURRENT_USER, kRegistryBase, KEY_READ);
-  return key.ReadValue(kSelectedLang, language);
-}
-
-bool GoogleUpdateSettings::GetBrand(std::wstring* brand) {
-  RegKey key(HKEY_CURRENT_USER, kRegistryBase, KEY_READ);
-  return key.ReadValue(kRLZBrand, brand);
-}
diff --git a/chrome/app/google_update_settings.h b/chrome/app/google_update_settings.h
deleted file mode 100644
index 9307256..0000000
--- a/chrome/app/google_update_settings.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CHROME_APP_GOOGLE_UPDATE_SETTINGS_H__
-#define CHROME_APP_GOOGLE_UPDATE_SETTINGS_H__
-
-#include <string>
-
-#include "base/basictypes.h"
-
-// This class provides accessors to the Google Update 'ClientState' information
-// that recorded when the user downloads the chrome installer. It is
-// google_update.exe responsability to write the initial values.
-class GoogleUpdateSettings {
- public:
-  // Returns whether the user has given consent to collect UMA data and send
-  // crash dumps to Google. This information is collected by the web server
-  // used to download the chrome installer.
-  static bool GetCollectStatsConsent();
-
-  // Sets the user consent to send UMA and crash dumps to Google. Returns
-  // false if the setting could not be recorded.
-  static bool SetCollectStatsConsent(bool consented);
-
-  // Returns in 'browser' the browser used to download chrome as recorded
-  // Google Update. Returns false if the information is not available.
-  static bool GetBrowser(std::wstring* browser);
-
-  // Returns in 'language' the language selected by the user when downloading
-  // chrome. This information is collected by the web server used to download
-  // the chrome installer. Returns false if the information is not available.
-  static bool GetLanguage(std::wstring* language);
-
-  // Returns in 'brand' the RLZ brand code or distribution tag that has been
-  // assigned to a partner. Returns false if the information is not available.
-  static bool GetBrand(std::wstring* brand);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
-};
-
-#endif  // CHROME_APP_GOOGLE_UPDATE_SETTINGS_H__