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

net/base/host_resolver_impl_unittest.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/base/host_resolver_impl.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 74 matching lines @@
     event_.Signal();
   }
 
   virtual int Resolve(const std::string& hostname,
                       AddressFamily address_family,
                       HostResolverFlags host_resolver_flags,
                       AddressList* addrlist,
                       int* os_error) {
     event_.Wait();
     {
-      AutoLock l(lock_);
+      base::AutoLock l(lock_);
       capture_list_.push_back(CaptureEntry(hostname, address_family));
     }
     return ResolveUsingPrevious(hostname, address_family,
                                 host_resolver_flags, addrlist, os_error);
   }
 
   CaptureList GetCaptureList() const {
     CaptureList copy;
     {
-      AutoLock l(lock_);
+      base::AutoLock l(lock_);
       copy = capture_list_;
     }
     return copy;
   }
 
  private:
   ~CapturingHostResolverProc() {}
 
   CaptureList capture_list_;
-  mutable Lock lock_;
+  mutable base::Lock lock_;
   base::WaitableEvent event_;
 };
 
 // This resolver function creates an IPv4 address, whose numeral value
 // describes a hash of the requested hostname, and the value of the requested
 // address_family.
 //
 // The resolved address for (hostname, address_family) will take the form:
 //    192.x.y.z
 //
@@ skipping 1529 matching lines @@
   EXPECT_EQ("192.1.98.2", NetAddressToString(addrlist[1].head()));
   EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[2].head()));
   EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[3].head()));
 }
 
 // TODO(cbentzel): Test a mix of requests with different HostResolverFlags.
 
 }  // namespace
 
 }  // namespace net