summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 11:06:56 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 11:06:56 +0000
commite301da283ab61ff78a108d5ed3246d8b09614ef2 (patch)
treee4546bb68becaebb57c013de7c4e317c6d9bd707 /chrome/browser
parentbd428e8a9d63c6ca1b1e691fc24091355584b0d8 (diff)
downloadchromium_src-e301da283ab61ff78a108d5ed3246d8b09614ef2.zip
chromium_src-e301da283ab61ff78a108d5ed3246d8b09614ef2.tar.gz
chromium_src-e301da283ab61ff78a108d5ed3246d8b09614ef2.tar.bz2
Add temporary traces to google update to see why a test is failing only on the buildbots.
BUG=None TEST=None Review URL: http://codereview.chromium.org/8437049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/google/google_update.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc
index d55e556..317201d 100644
--- a/chrome/browser/google/google_update.cc
+++ b/chrome/browser/google/google_update.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/google/google_update.h"
+#include <iostream>
+
#include <atlbase.h>
#include <atlcom.h>
@@ -42,10 +44,15 @@ GoogleUpdateErrorCode CanUpdateCurrentChrome(
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
FilePath user_exe_path = installer::GetChromeInstallPath(false, dist);
FilePath machine_exe_path = installer::GetChromeInstallPath(true, dist);
+ std::cout << "About to compare: \n" << chrome_exe_path.value().c_str()
+ << " to \n"
+ << user_exe_path.value().c_str() << " and \n"
+ << machine_exe_path.value().c_str() << "\n";
if (!FilePath::CompareEqualIgnoreCase(chrome_exe_path.value(),
user_exe_path.value()) &&
!FilePath::CompareEqualIgnoreCase(chrome_exe_path.value(),
machine_exe_path.value())) {
+ std::cout << "Drop into if\n";
LOG(ERROR) << L"Google Update cannot update Chrome installed in a "
<< L"non-standard location: " << chrome_exe_path.value().c_str()
<< L". The standard location is: "
@@ -53,6 +60,7 @@ GoogleUpdateErrorCode CanUpdateCurrentChrome(
<< L" or " << machine_exe_path.value().c_str() << L".";
return CANNOT_UPGRADE_CHROME_IN_THIS_DIRECTORY;
}
+ std::cout << "We continue\n";
string16 app_guid = installer::GetAppGuidForUpdates(
!InstallUtil::IsPerUserInstall(chrome_exe_path.value().c_str()));
@@ -168,6 +176,7 @@ class GoogleUpdateJobObserver
case COMPLETION_CODE_ERROR:
error_message_ = text;
default: {
+ std::cout << "Error message: " << error_message_.c_str();
NOTREACHED();
result_ = UPGRADE_ERROR;
break;