Addressing remaining Breakpad integration issues:

- Offer to enable crash dump reporting when the host is not installed yet.
- Do not log anything until logging is initialized to avoid Application Verifier errors.

BUG=130678


Review URL: https://chromiumcodereview.appspot.com/10695012

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

2 files changed, 14 insertions, 4 deletions

diff --git a/remoting/host/plugin/daemon_controller_win.cc b/remoting/host/plugin/daemon_controller_win.cc
index 040b146..2d8082c 100644
--- a/remoting/host/plugin/daemon_controller_win.cc
+++ b/remoting/host/plugin/daemon_controller_win.cc
@@ -643,7 +643,17 @@ void DaemonControllerWin::DoGetUsageStatsConsent(
 
   // Activate the Daemon Controller and see if it supports |IDaemonControl2|.
   HRESULT hr = ActivateController();
-  if (FAILED(hr) || control2_.get() == NULL) {
+  if (FAILED(hr)) {
+    // The host is not installed yet. Assume that the user's consent is not
+    // recorded yet and set the default value to true. This value will not come
+    // into effect until the user installs the host and agrees to crash
+    // dump reporting.
+    done.Run(true, true, false);
+    return;
+  }
+
+  if (control2_.get() == NULL) {
+    // The host is installed and does not support crash dump reporting.
     done.Run(false, false, false);
     return;
   }
@@ -655,7 +665,7 @@ void DaemonControllerWin::DoGetUsageStatsConsent(
   if (FAILED(hr)) {
     // If the user's consent is not recorded yet, set the default value to true.
     // This value will not come into effect until the user agrees to crash
-    // dump reporting while starting the host.
+    // dump reporting.
     done.Run(true, true, false);
     return;
   }
diff --git a/remoting/host/usage_stats_consent_win.cc b/remoting/host/usage_stats_consent_win.cc
index bf73c28..cefb1cf 100644
--- a/remoting/host/usage_stats_consent_win.cc
+++ b/remoting/host/usage_stats_consent_win.cc
@@ -58,8 +58,8 @@ bool GetUsageStatsConsent(bool* allowed, bool* set_by_policy) {
     return true;
   }
 
-  LOG_GETLASTERROR(ERROR)
-      << "Failed to record the user's consent to crash dump reporting";
+  // We do not log the error code here because the logging hasn't been
+  // initialized yet.
   return false;
 }