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

chrome/browser/printing/print_dialog_cloud.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/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include "app/l10n_util.h"
 #include "base/base64.h"
 #include "base/file_util.h"
@@ skipping 130 matching lines @@
 
 void CloudPrintDataSenderHelper::CallJavascriptFunction(
     const std::wstring& function_name, const Value& arg1, const Value& arg2) {
   dom_ui_->CallJavascriptFunction(function_name, arg1, arg2);
 }
 
 // Clears out the pointer we're using to communicate.  Either routine is
 // potentially expensive enough that stopping whatever is in progress
 // is worth it.
 void CloudPrintDataSender::CancelPrintDataFile() {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   // We don't own helper, it was passed in to us, so no need to
   // delete, just let it go.
   helper_ = NULL;
 }
 
 CloudPrintDataSender::CloudPrintDataSender(CloudPrintDataSenderHelper* helper,
                                            const string16& print_job_title)
     : helper_(helper),
       print_job_title_(print_job_title) {
 }
@@ skipping 33 matching lines @@
 // We have the data in hand that needs to be pushed into the dialog
 // contents; do so from the IO thread.
 
 // TODO(scottbyer): If the print data ends up being larger than the
 // upload limit (currently 10MB), what we need to do is upload that
 // large data to google docs and set the URL in the printing
 // JavaScript to that location, and make sure it gets deleted when not
 // needed. - 4/1/2010
 void CloudPrintDataSender::SendPrintDataFile() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   if (helper_ && print_data_.get()) {
     StringValue title(print_job_title_);
 
     // Send the print data to the dialog contents.  The JavaScript
     // function is a preliminary API for prototyping purposes and is
     // subject to change.
     const_cast<CloudPrintDataSenderHelper*>(helper_)->CallJavascriptFunction(
         L"printApp._printDataUrl", *print_data_, title);
   }
 }
@@ skipping 311 matching lines @@
   int width = pref_service->GetInteger(prefs::kCloudPrintDialogWidth);
   int height = pref_service->GetInteger(prefs::kCloudPrintDialogHeight);
   HtmlDialogUIDelegate* dialog_delegate =
       new internal_cloud_print_helpers::CloudPrintHtmlDialogDelegate(
           path_to_pdf, width, height, std::string(), print_job_title);
   browser_->BrowserShowHtmlDialog(dialog_delegate, NULL);
 }
 
 PrintDialogCloud::~PrintDialogCloud() {
 }