Removed LOG_GETLASTERROR and LOG_ERRNO macros.

remoting/host/win/elevated_controller.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/win/elevated_controller.h"
 
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 90 matching lines @@
       CreateFileW(filename.value().c_str(),
                   GENERIC_READ,
                   FILE_SHARE_READ | FILE_SHARE_WRITE,
                   NULL,
                   OPEN_EXISTING,
                   FILE_FLAG_SEQUENTIAL_SCAN,
                   NULL));
 
   if (!file.IsValid()) {
     DWORD error = GetLastError();
-    LOG_GETLASTERROR(ERROR)
-        << "Failed to open '" << filename.value() << "'";
+    PLOG(ERROR) << "Failed to open '" << filename.value() << "'";
     return HRESULT_FROM_WIN32(error);
   }
 
   scoped_ptr<char[]> buffer(new char[kMaxConfigFileSize]);
   DWORD size = kMaxConfigFileSize;
   if (!::ReadFile(file, &buffer[0], size, &size, NULL)) {
     DWORD error = GetLastError();
-    LOG_GETLASTERROR(ERROR)
-        << "Failed to read '" << filename.value() << "'";
+    PLOG(ERROR) << "Failed to read '" << filename.value() << "'";
     return HRESULT_FROM_WIN32(error);
   }
 
   // Parse the JSON configuration, expecting it to contain a dictionary.
   std::string file_content(buffer.get(), size);
   scoped_ptr<base::Value> value(
       base::JSONReader::Read(file_content, base::JSON_ALLOW_TRAILING_COMMAS));
 
   base::DictionaryValue* dictionary;
   if (value.get() == NULL || !value->GetAsDictionary(&dictionary)) {
@@ skipping 12 matching lines @@
 
 // Writes a config file to a temporary location.
 HRESULT WriteConfigFileToTemp(const base::FilePath& filename,
                               const char* security_descriptor,
                               const char* content,
                               size_t length) {
   // Create the security descriptor for the configuration file.
   ScopedSd sd = ConvertSddlToSd(security_descriptor);
   if (!sd) {
     DWORD error = GetLastError();
-    LOG_GETLASTERROR(ERROR) <<
-        "Failed to create a security descriptor for the configuration file";
+    PLOG(ERROR)
+        << "Failed to create a security descriptor for the configuration file";
     return HRESULT_FROM_WIN32(error);
   }
 
   SECURITY_ATTRIBUTES security_attributes = {0};
   security_attributes.nLength = sizeof(security_attributes);
   security_attributes.lpSecurityDescriptor = sd.get();
   security_attributes.bInheritHandle = FALSE;
 
   // Create a temporary file and write configuration to it.
   base::FilePath tempname = GetTempLocationFor(filename);
   base::win::ScopedHandle file(
       CreateFileW(tempname.value().c_str(),
                   GENERIC_WRITE,
                   0,
                   &security_attributes,
                   CREATE_ALWAYS,
                   FILE_FLAG_SEQUENTIAL_SCAN,
                   NULL));
 
   if (!file.IsValid()) {
     DWORD error = GetLastError();
-    LOG_GETLASTERROR(ERROR)
-        << "Failed to create '" << filename.value() << "'";
+    PLOG(ERROR) << "Failed to create '" << filename.value() << "'";
     return HRESULT_FROM_WIN32(error);
   }
 
   DWORD written;
   if (!WriteFile(file, content, static_cast<DWORD>(length), &written, NULL)) {
     DWORD error = GetLastError();
-    LOG_GETLASTERROR(ERROR)
-        << "Failed to write to '" << filename.value() << "'";
+    PLOG(ERROR) << "Failed to write to '" << filename.value() << "'";
     return HRESULT_FROM_WIN32(error);
   }
 
   return S_OK;
 }
 
 // Moves a config file from its temporary location to its permanent location.
 HRESULT MoveConfigFileFromTemp(const base::FilePath& filename) {
   // Now that the configuration is stored successfully replace the actual
   // configuration file.
   base::FilePath tempname = GetTempLocationFor(filename);
   if (!MoveFileExW(tempname.value().c_str(),
                    filename.value().c_str(),
                    MOVEFILE_REPLACE_EXISTING)) {
       DWORD error = GetLastError();
-      LOG_GETLASTERROR(ERROR)
-          << "Failed to rename '" << tempname.value() << "' to '"
-          << filename.value() << "'";
+      PLOG(ERROR) << "Failed to rename '" << tempname.value() << "' to '"
+                  << filename.value() << "'";
       return HRESULT_FROM_WIN32(error);
   }
 
   return S_OK;
 }
 
 // Writes the configuration file up to |kMaxConfigFileSize| in size.
 HRESULT WriteConfig(const char* content, size_t length, HWND owner_window) {
   if (length > kMaxConfigFileSize) {
       return E_FAIL;
@@ skipping 167 matching lines @@
                               SERVICE_AUTO_START,
                               SERVICE_NO_CHANGE,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL)) {
     DWORD error = GetLastError();
-    LOG_GETLASTERROR(ERROR)
-        << "Failed to change the '" << kWindowsServiceName
-        << "'service start type to 'auto'";
+    PLOG(ERROR) << "Failed to change the '" << kWindowsServiceName
+                << "'service start type to 'auto'";
     return HRESULT_FROM_WIN32(error);
   }
 
   // Start the service.
   if (!StartService(service, 0, NULL)) {
     DWORD error = GetLastError();
     if (error != ERROR_SERVICE_ALREADY_RUNNING) {
-      LOG_GETLASTERROR(ERROR)
-          << "Failed to start the '" << kWindowsServiceName << "'service";
+      PLOG(ERROR) << "Failed to start the '" << kWindowsServiceName
+                  << "'service";
 
       return HRESULT_FROM_WIN32(error);
     }
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ElevatedController::StopDaemon() {
   ScopedScHandle service;
   HRESULT hr = OpenService(&service);
   if (FAILED(hr)) {
     return hr;
   }
 
   // Change the service start type to 'manual'.
   if (!::ChangeServiceConfigW(service,
                               SERVICE_NO_CHANGE,
                               SERVICE_DEMAND_START,
                               SERVICE_NO_CHANGE,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL)) {
     DWORD error = GetLastError();
-    LOG_GETLASTERROR(ERROR)
-        << "Failed to change the '" << kWindowsServiceName
-        << "'service start type to 'manual'";
+    PLOG(ERROR) << "Failed to change the '" << kWindowsServiceName
+                << "'service start type to 'manual'";
     return HRESULT_FROM_WIN32(error);
   }
 
   // Stop the service.
   SERVICE_STATUS status;
   if (!ControlService(service, SERVICE_CONTROL_STOP, &status)) {
     DWORD error = GetLastError();
     if (error != ERROR_SERVICE_NOT_ACTIVE) {
-      LOG_GETLASTERROR(ERROR)
-          << "Failed to stop the '" << kWindowsServiceName << "'service";
+      PLOG(ERROR) << "Failed to stop the '" << kWindowsServiceName
+                  << "'service";
       return HRESULT_FROM_WIN32(error);
     }
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ElevatedController::UpdateConfig(BSTR config) {
   // Parse the config.
   std::string config_str = base::UTF16ToUTF8(
@@ skipping 50 matching lines @@
 }
 
 HRESULT ElevatedController::OpenService(ScopedScHandle* service_out) {
   DWORD error;
 
   ScopedScHandle scmanager(
       ::OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE,
                        SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE));
   if (!scmanager.IsValid()) {
     error = GetLastError();
-    LOG_GETLASTERROR(ERROR)
-        << "Failed to connect to the service control manager";
+    PLOG(ERROR) << "Failed to connect to the service control manager";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   DWORD desired_access = SERVICE_CHANGE_CONFIG | SERVICE_QUERY_STATUS |
                          SERVICE_START | SERVICE_STOP;
   ScopedScHandle service(
       ::OpenServiceW(scmanager, kWindowsServiceName, desired_access));
   if (!service.IsValid()) {
     error = GetLastError();
-    LOG_GETLASTERROR(ERROR)
-        << "Failed to open to the '" << kWindowsServiceName << "' service";
+    PLOG(ERROR) << "Failed to open to the '" << kWindowsServiceName
+                << "' service";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   service_out->Set(service.Take());
   return S_OK;
 }
 
 } // namespace remoting