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

media/filters/file_data_source.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 <limits>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "media/base/filter_host.h"
@@ skipping 32 matching lines @@
   }
   media_format_.SetAsString(MediaFormat::kMimeType,
                             mime_type::kApplicationOctetStream);
   media_format_.SetAsString(MediaFormat::kURL, url);
   host()->SetTotalBytes(file_size_);
   host()->SetBufferedBytes(file_size_);
   callback->Run();
 }
 
 void FileDataSource::Stop(FilterCallback* callback) {
-  AutoLock l(lock_);
+  base::AutoLock l(lock_);
   if (file_) {
     file_util::CloseFile(file_);
     file_ = NULL;
     file_size_ = 0;
   }
   if (callback) {
     callback->Run();
     delete callback;
   }
 }
 
 const MediaFormat& FileDataSource::media_format() {
   return media_format_;
 }
 
 void FileDataSource::Read(int64 position, size_t size, uint8* data,
                           ReadCallback* read_callback) {
   DCHECK(file_);
-  AutoLock l(lock_);
+  base::AutoLock l(lock_);
   scoped_ptr<ReadCallback> callback(read_callback);
   if (file_) {
 #if defined(OS_WIN)
     if (_fseeki64(file_, position, SEEK_SET)) {
       callback->RunWithParams(
           Tuple1<size_t>(static_cast<size_t>(DataSource::kReadError)));
       return;
     }
 #else
     CHECK(position <= std::numeric_limits<int32>::max());
@@ skipping 11 matching lines @@
       return;
     }
   }
 
   callback->RunWithParams(Tuple1<size_t>(static_cast<size_t>(kReadError)));
 }
 
 bool FileDataSource::GetSize(int64* size_out) {
   DCHECK(size_out);
   DCHECK(file_);
-  AutoLock l(lock_);
+  base::AutoLock l(lock_);
   *size_out = file_size_;
   return (NULL != file_);
 }
 
 bool FileDataSource::IsStreaming() {
   return false;
 }
 
 }  // namespace media