/C++ readability/ - Make Chromoting Host report crashes to Breakpad (Windows only). The user must e…

remoting/host/plugin/daemon_installer_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/plugin/daemon_installer_win.h"
 
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/stringize_macros.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/win/object_watcher.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_variant.h"
+#include "google_update/google_update_idl.h"
 #include "remoting/base/dispatch_win.h"
-
-namespace omaha {
-#include "google_update/google_update_idl.h"
-}  // namespace omaha
-
 #include "remoting/host/constants.h"
 
 using base::win::ScopedBstr;
 using base::win::ScopedComPtr;
 using base::win::ScopedVariant;
 
 namespace {
 
 // The COM elevation moniker for Omaha.
 const char16 kOmahaElevationMoniker[] =
@@ skipping 149 matching lines @@
     return;
   }
   if (current_state.type() != VT_DISPATCH) {
     Done(DISP_E_TYPEMISMATCH);
     return;
   }
 
   ScopedVariant state;
   hr = dispatch::Invoke(V_DISPATCH(&current_state), L"stateValue",
                         DISPATCH_PROPERTYGET, state.Receive());
-  if (FAILED(hr)) {
-    Done(hr);
-    return;
-  }
   if (state.type() != VT_I4) {
     Done(DISP_E_TYPEMISMATCH);
     return;
   }
 
   // Perform state-specific actions.
   switch (V_I4(&state)) {
-    case omaha::STATE_INIT:
-    case omaha::STATE_WAITING_TO_CHECK_FOR_UPDATE:
-    case omaha::STATE_CHECKING_FOR_UPDATE:
-    case omaha::STATE_WAITING_TO_DOWNLOAD:
-    case omaha::STATE_RETRYING_DOWNLOAD:
-    case omaha::STATE_DOWNLOADING:
-    case omaha::STATE_WAITING_TO_INSTALL:
-    case omaha::STATE_INSTALLING:
-    case omaha::STATE_PAUSED:
+    case STATE_INIT:
+    case STATE_WAITING_TO_CHECK_FOR_UPDATE:
+    case STATE_CHECKING_FOR_UPDATE:
+    case STATE_WAITING_TO_DOWNLOAD:
+    case STATE_RETRYING_DOWNLOAD:
+    case STATE_DOWNLOADING:
+    case STATE_WAITING_TO_INSTALL:
+    case STATE_INSTALLING:
+    case STATE_PAUSED:
       break;
 
-    case omaha::STATE_UPDATE_AVAILABLE:
+    case STATE_UPDATE_AVAILABLE:
       hr = dispatch::Invoke(V_DISPATCH(&bundle_), L"download",
                             DISPATCH_METHOD, NULL);
       if (FAILED(hr)) {
         Done(hr);
         return;
       }
       break;
 
-    case omaha::STATE_DOWNLOAD_COMPLETE:
-    case omaha::STATE_EXTRACTING:
-    case omaha::STATE_APPLYING_DIFFERENTIAL_PATCH:
-    case omaha::STATE_READY_TO_INSTALL:
+    case STATE_DOWNLOAD_COMPLETE:
+    case STATE_EXTRACTING:
+    case STATE_APPLYING_DIFFERENTIAL_PATCH:
+    case STATE_READY_TO_INSTALL:
       hr = dispatch::Invoke(V_DISPATCH(&bundle_), L"install",
                             DISPATCH_METHOD, NULL);
       if (FAILED(hr)) {
         Done(hr);
         return;
       }
       break;
 
-    case omaha::STATE_INSTALL_COMPLETE:
-    case omaha::STATE_NO_UPDATE:
+    case STATE_INSTALL_COMPLETE:
+    case STATE_NO_UPDATE:
       // Installation complete or not required. Report success.
       Done(S_OK);
       return;
 
-    case omaha::STATE_ERROR: {
+    case STATE_ERROR: {
       ScopedVariant error_code;
       hr = dispatch::Invoke(V_DISPATCH(&current_state), L"errorCode",
                             DISPATCH_PROPERTYGET, error_code.Receive());
       if (FAILED(hr)) {
         Done(hr);
         return;
       }
       if (error_code.type() != VT_UI4) {
         Done(DISP_E_TYPEMISMATCH);
         return;
@@ skipping 132 matching lines @@
     HWND parent = GetAncestor(window, GA_PARENT);
     if (parent == NULL) {
       return window;
     }
 
     window = parent;
   }
 }
 
 }  // namespace remoting