Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

chrome/browser/printing/print_job_manager.cc

 // Copyright (c) 2006-2008 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/browser/printing/print_job_manager.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "printing/printed_document.h"
 #include "printing/printed_page.h"
 
 namespace printing {
 
 PrintJobManager::PrintJobManager() {
   registrar_.Add(this, NotificationType::PRINT_JOB_EVENT,
                  NotificationService::AllSources());
 }
 
 PrintJobManager::~PrintJobManager() {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   queued_queries_.clear();
 }
 
 void PrintJobManager::OnQuit() {
 #if defined(OS_MACOSX)
   // OnQuit is too late to try to wait for jobs on the Mac, since the runloop
   // has already been torn down; instead, StopJobs(true) is called earlier in
   // the shutdown process, and this is just here in case something sneaks
   // in after that.
   StopJobs(false);
@@ skipping 17 matching lines @@
       // Wait for 120 seconds for the print job to be spooled.
       if (wait_for_finish)
         job->FlushJob(120000);
       job->Stop();
     }
   }
   current_jobs_.clear();
 }
 
 void PrintJobManager::QueuePrinterQuery(PrinterQuery* job) {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   DCHECK(job);
   queued_queries_.push_back(make_scoped_refptr(job));
   DCHECK(job->is_valid());
 }
 
 void PrintJobManager::PopPrinterQuery(int document_cookie,
                                       scoped_refptr<PrinterQuery>* job) {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   for (PrinterQueries::iterator itr = queued_queries_.begin();
        itr != queued_queries_.end();
        ++itr) {
     PrinterQuery* current_query = *itr;
     if (current_query->cookie() == document_cookie &&
         !current_query->is_callback_pending()) {
       *job = current_query;
       queued_queries_.erase(itr);
       DCHECK(current_query->is_valid());
       return;
@@ skipping 74 matching lines @@
       break;
     }
     default: {
       NOTREACHED();
       break;
     }
   }
 }
 
 bool PrintJobManager::printing_enabled() {
-  AutoLock lock(enabled_lock_);
+  base::AutoLock lock(enabled_lock_);
   return printing_enabled_;
 }
 
 void PrintJobManager::set_printing_enabled(bool printing_enabled) {
-  AutoLock lock(enabled_lock_);
+  base::AutoLock lock(enabled_lock_);
   printing_enabled_ = printing_enabled;
 }
 
 }  // namespace printing