Revert of clang/win: Fix a few warnings in targets not in chromium_builder_tests.

cloud_print/service/win/cloud_print_service.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 <atlbase.h>
 #include <security.h>
 
 #include <iomanip>
 #include <iostream>
 #include <iterator>
@@ skipping 62 matching lines @@
 
   for (size_t i = 0; i < arraysize(kSwitchHelp); ++i) {
     std::cout << std::setiosflags(std::ios::left);
     std::cout << "  -" << std::setw(16) << kSwitchHelp[i].name;
     std::cout << cloud_print::LoadLocalString(kSwitchHelp[i].description);
     std::cout << "\n";
   }
   std::cout << "\n";
 }
 
-base::string16 GetOption(int string_id,
-                         const base::string16& default_option,
-                         bool secure) {
+base::string16 GetOption(int string_id, const base::string16& default,
+                   bool secure) {
   base::string16 prompt_format = cloud_print::LoadLocalString(string_id);
-  std::vector<base::string16> substitutions(1, default_option);
+  std::vector<base::string16> substitutions(1, default);
   std::cout << ReplaceStringPlaceholders(prompt_format, substitutions, NULL);
   base::string16 tmp;
   if (secure) {
     DWORD saved_mode = 0;
     // Don't close.
     HANDLE stdin_handle = ::GetStdHandle(STD_INPUT_HANDLE);
     ::GetConsoleMode(stdin_handle, &saved_mode);
     ::SetConsoleMode(stdin_handle, saved_mode & ~ENABLE_ECHO_INPUT);
     std::getline(std::wcin, tmp);
     ::SetConsoleMode(stdin_handle, saved_mode);
     std::cout << "\n";
   } else {
     std::getline(std::wcin, tmp);
   }
   if (tmp.empty())
-    return default_option;
+    return default;
   return tmp;
 }
 
 HRESULT ReportError(HRESULT hr, int string_id) {
   LOG(ERROR) << cloud_print::GetErrorMessage(hr);
   std::cerr << cloud_print::LoadLocalString(string_id);
   std::cerr << "\n";
   return hr;
 }
 
@@ skipping 297 matching lines @@
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
 
   logging::SetMinLogLevel(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableLogging) ?
       logging::LOG_INFO : logging::LOG_FATAL);
 
   return _AtlModule.WinMain(0);
 }