move base/object_watcher into base/win and add the win namespace. Fixup calle...

chrome/service/cloud_print/print_system_win.cc

 // Copyright (c) 2010 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 "chrome/service/cloud_print/print_system.h"
 
 #include <objidl.h>
 #include <winspool.h>
 
 #include "base/file_path.h"
-#include "base/object_watcher.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/object_watcher.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_hdc.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/service_process.h"
 #include "chrome/service/service_utility_process_host.h"
 #include "gfx/rect.h"
 #include "printing/backend/print_backend.h"
 #include "printing/backend/print_backend_consts.h"
 #include "printing/backend/win_helper.h"
@@ skipping 79 matching lines @@
     }
     printing::XPSModule::CloseProvider(provider);
   }
   return hr;
 }
 
 }  // namespace
 
 namespace cloud_print {
 
-class PrintSystemWatcherWin
-    : public base::ObjectWatcher::Delegate {
+class PrintSystemWatcherWin : public base::win::ObjectWatcher::Delegate {
  public:
   PrintSystemWatcherWin()
       : printer_(NULL),
         printer_change_(NULL),
         delegate_(NULL),
         did_signal_(false) {
   }
   ~PrintSystemWatcherWin() {
     Stop();
   }
@@ skipping 92 matching lines @@
           printer_info->options[kDriverNameTagName] =
               WideToUTF8(printer_info_win->pDriverName);
         printer_info->printer_status = printer_info_win->Status;
         ret = true;
       }
     }
     return ret;
   }
 
  private:
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
   HANDLE printer_;            // The printer being watched
   HANDLE printer_change_;     // Returned by FindFirstPrinterChangeNotifier
   Delegate* delegate_;        // Delegate to notify
   bool did_signal_;           // DoneWaiting was called
 };
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate.
 // In this case, some compilers get confused and inherit
 // PrintSystemWin watchers from wrong Delegate, giving C2664 and C2259 errors.
@@ skipping 489 matching lines @@
   RpcStringFree(reinterpret_cast<RPC_WSTR *>(&proxy_id_as_string));
   return ret;
 }
 
 scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
     const DictionaryValue* print_system_settings) {
   return new PrintSystemWin;
 }
 
 }  // namespace cloud_print