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

chrome/browser/printing/print_dialog_gtk.cc

 // Copyright (c) 2009 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_dialog_gtk.h"
 
 #include <gtk/gtkprintjob.h>
 #include <gtk/gtkprintunixdialog.h>
 #include <gtk/gtkpagesetupunixdialog.h>
 
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/lazy_instance.h"
-#include "base/lock.h"
 #include "base/logging.h"
+#include "base/synchronization/lock.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 namespace {
 
 PrintDialogGtk* g_print_dialog = NULL;
 
 // Used to make accesses to the above thread safe.
-Lock& DialogLock() {
-  static base::LazyInstance<Lock> dialog_lock(base::LINKER_INITIALIZED);
+base::Lock& DialogLock() {
+  static base::LazyInstance<base::Lock> dialog_lock(base::LINKER_INITIALIZED);
   return dialog_lock.Get();
 }
 
 // This is a temporary infobar designed to help gauge how many users are trying
 // to print to printers that don't support PDF.
 class PdfUnsupportedInfoBarDelegate : public LinkInfoBarDelegate {
  public:
   explicit PdfUnsupportedInfoBarDelegate(Browser* browser)
      : LinkInfoBarDelegate(NULL),
        browser_(browser) {
@@ skipping 29 matching lines @@
 
 // static
 void PrintDialogGtk::CreatePrintDialogForPdf(const FilePath& path) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(&PrintDialogGtk::CreateDialogImpl, path));
 }
 
 // static
 bool PrintDialogGtk::DialogShowing() {
-  AutoLock lock(DialogLock());
+  base::AutoLock lock(DialogLock());
   return !!g_print_dialog;
 }
 
 // static
 void PrintDialogGtk::CreateDialogImpl(const FilePath& path) {
   // Only show one print dialog at once. This is to prevent a page from
   // locking up the system with
   //
   //   while(true){print();}
-  AutoLock lock(DialogLock());
+  base::AutoLock lock(DialogLock());
   if (g_print_dialog)
     return;
 
   g_print_dialog = new PrintDialogGtk(path);
 }
 
 PrintDialogGtk::PrintDialogGtk(const FilePath& path_to_pdf)
     : path_to_pdf_(path_to_pdf),
       browser_(BrowserList::GetLastActive()) {
   GtkWindow* parent = browser_->window()->GetNativeHandle();
 
   // TODO(estade): We need a window title here.
   dialog_ = gtk_print_unix_dialog_new(NULL, parent);
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
 
   gtk_widget_show(dialog_);
 }
 
 PrintDialogGtk::~PrintDialogGtk() {
-  AutoLock lock(DialogLock());
+  base::AutoLock lock(DialogLock());
   DCHECK_EQ(this, g_print_dialog);
   g_print_dialog = NULL;
 }
 
 void PrintDialogGtk::OnResponse(GtkWidget* dialog, gint response_id) {
   gtk_widget_hide(dialog_);
 
   switch (response_id) {
     case GTK_RESPONSE_OK: {
       GtkPrinter* printer =
@@ skipping 51 matching lines @@
     g_object_unref(job);
 
   base::FileUtilProxy::Delete(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
       path_to_pdf_,
       false,
       NULL);
 
   delete this;
 }