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

10 files changed, 20 insertions, 27 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/browser/browser_main.cc b/chrome/browser/browser_main.cc
index c3531a2..24f07ce 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -40,7 +40,6 @@
 #include "base/registry.h"
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
-#include "chrome/app/google_update_settings.h"
 #include "chrome/app/result_codes.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/browser.h"
@@ -73,6 +72,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
+#include "chrome/installer/util/google_update_settings.h"
 #include "chrome/views/accelerator_handler.h"
 #include "net/base/net_module.h"
 #include "net/base/net_resources.h"
diff --git a/chrome/browser/metrics_service.cc b/chrome/browser/metrics_service.cc
index 524b4eb..038ebf9 100644
--- a/chrome/browser/metrics_service.cc
+++ b/chrome/browser/metrics_service.cc
@@ -187,7 +187,6 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/task.h"
-#include "chrome/app/google_update_settings.h"
 #include "chrome/browser/bookmark_bar_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ -204,6 +203,7 @@
 #include "chrome/common/libxml_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
+#include "chrome/installer/util/google_update_settings.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "third_party/bzip2/bzlib.h"
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index 00cee6d..9bf2600 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -41,13 +41,13 @@
 #include "base/path_service.h"
 #include "base/task.h"
 #include "base/thread.h"
-#include "chrome/app/google_update_settings.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/env_vars.h"
+#include "chrome/installer/util/google_update_settings.h"
 //#include "chrome/common/pref_names.h"
 //#include "chrome/common/pref_service.h"
 
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 48d30e1..db50143 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -210,6 +210,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_exe", "app\chrome_ex
 		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
 		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
 		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
 	EndProjectSection
 EndProject
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 0be9b04..c9b80ab 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -42,7 +42,6 @@
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "base/wmi_util.h"
-#include "chrome/app/google_update_settings.h"
 #include "chrome/app/result_codes.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/setup/setup_constants.h"
@@ -51,6 +50,7 @@
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/logging_installer.h"
 #include "chrome/installer/util/google_update_constants.h"
+#include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/version.h"
diff --git a/chrome/app/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index eb8eb4a..24ff326 100644
--- a/chrome/app/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -27,7 +27,7 @@
 // (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 "chrome/installer/util/google_update_settings.h"
 
 #include "base/registry.h"
 
diff --git a/chrome/app/google_update_settings.h b/chrome/installer/util/google_update_settings.h
index 9307256..6faea3e 100644
--- a/chrome/app/google_update_settings.h
+++ b/chrome/installer/util/google_update_settings.h
@@ -27,8 +27,8 @@
 // (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__
+#ifndef CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
+#define CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 
 #include <string>
 
@@ -65,4 +65,4 @@ class GoogleUpdateSettings {
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
 };
 
-#endif  // CHROME_APP_GOOGLE_UPDATE_SETTINGS_H__
+#endif  // CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
diff --git a/chrome/installer/util/util.vcproj b/chrome/installer/util/util.vcproj
index a63254c..0eac40b 100644
--- a/chrome/installer/util/util.vcproj
+++ b/chrome/installer/util/util.vcproj
@@ -41,14 +41,6 @@
 	</Configurations>
 	<Files>
 		<File
-			RelativePath="..\..\app\google_update_settings.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\..\app\google_update_settings.h"
-			>
-		</File>
-		<File
 			RelativePath="copy_tree_work_item.cc"
 			>
 		</File>
@@ -81,6 +73,14 @@
 			>
 		</File>
 		<File
+			RelativePath="google_update_settings.cc"
+			>
+		</File>
+		<File
+			RelativePath="google_update_settings.h"
+			>
+		</File>
+		<File
 			RelativePath="helper.cc"
 			>
 		</File>