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

net/url_request/url_request_job_manager.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 "net/url_request/url_request_job_manager.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 #include "base/singleton.h"
@@ skipping 134 matching lines @@
     net::URLRequestJob* job = (*i)->MaybeInterceptResponse(request);
     if (job)
       return job;
   }
   return NULL;
 }
 
 bool URLRequestJobManager::SupportsScheme(const std::string& scheme) const {
   // The set of registered factories may change on another thread.
   {
-    AutoLock locked(lock_);
+    base::AutoLock locked(lock_);
     if (factories_.find(scheme) != factories_.end())
       return true;
   }
 
   for (size_t i = 0; i < arraysize(kBuiltinFactories); ++i)
     if (LowerCaseEqualsASCII(scheme, kBuiltinFactories[i].scheme))
       return true;
 
   return false;
 }
 
 net::URLRequest::ProtocolFactory* URLRequestJobManager::RegisterProtocolFactory(
     const std::string& scheme,
     net::URLRequest::ProtocolFactory* factory) {
 #ifndef NDEBUG
   DCHECK(IsAllowedThread());
 #endif
 
-  AutoLock locked(lock_);
+  base::AutoLock locked(lock_);
 
   net::URLRequest::ProtocolFactory* old_factory;
   FactoryMap::iterator i = factories_.find(scheme);
   if (i != factories_.end()) {
     old_factory = i->second;
   } else {
     old_factory = NULL;
   }
   if (factory) {
     factories_[scheme] = factory;
   } else if (i != factories_.end()) {  // uninstall any old one
     factories_.erase(i);
   }
   return old_factory;
 }
 
 void URLRequestJobManager::RegisterRequestInterceptor(
     net::URLRequest::Interceptor* interceptor) {
 #ifndef NDEBUG
   DCHECK(IsAllowedThread());
 #endif
 
-  AutoLock locked(lock_);
+  base::AutoLock locked(lock_);
 
   DCHECK(std::find(interceptors_.begin(), interceptors_.end(), interceptor) ==
          interceptors_.end());
   interceptors_.push_back(interceptor);
 }
 
 void URLRequestJobManager::UnregisterRequestInterceptor(
     net::URLRequest::Interceptor* interceptor) {
 #ifndef NDEBUG
   DCHECK(IsAllowedThread());
 #endif
 
-  AutoLock locked(lock_);
+  base::AutoLock locked(lock_);
 
   InterceptorList::iterator i =
       std::find(interceptors_.begin(), interceptors_.end(), interceptor);
   DCHECK(i != interceptors_.end());
   interceptors_.erase(i);
 }
 
 }  // namespace net