Switch to using the WebUI About screen on Windows.

chrome/browser/ui/webui/help/version_updater_chromeos.cc

Index: chrome/browser/ui/webui/help/version_updater_chromeos.cc
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index 1ebca5414a5d9fb2eed4b8d041b149b8b0354598..e215c7a2a4d45771e5fca83e53884d9c2fbe29fc 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -23,6 +23,14 @@ VersionUpdater* VersionUpdater::Create() {
   return new VersionUpdaterCros;
 }
 
+VersionUpdaterCros::VersionUpdaterCros() {}
+
+VersionUpdaterCros::~VersionUpdaterCros() {
+  UpdateEngineClient* update_engine_client =
+      DBusThreadManager::Get()->GetUpdateEngineClient();
+  update_engine_client->RemoveObserver(this);
+}
+
 void VersionUpdaterCros::CheckForUpdate(const StatusCallback& callback) {
   callback_ = callback;
 
@@ -64,6 +72,7 @@ void VersionUpdaterCros::GetReleaseChannel(const ChannelCallback& cb) {
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
+<<<<<<< HEAD
 VersionUpdaterCros::VersionUpdaterCros() : weak_ptr_factory_(this) {}
 
 VersionUpdaterCros::~VersionUpdaterCros() {
@@ -72,6 +81,8 @@ VersionUpdaterCros::~VersionUpdaterCros() {
   update_engine_client->RemoveObserver(this);
 }
 
+=======
+>>>>>>> patch from issue 9700049
 void VersionUpdaterCros::UpdateStatusChanged(
     const UpdateEngineClient::Status& status) {
   Status my_status = UPDATED;