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

chrome/browser/webdata/web_data_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "app/sql/init_status.h"
 #include "base/file_path.h"
-#include "base/lock.h"
 #include "base/ref_counted.h"
+#include "base/synchronization/lock.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "webkit/glue/form_field.h"
 
 class AutofillChange;
 class AutoFillProfile;
 class CreditCard;
 class GURL;
 #if defined(OS_WIN)
 struct IE7PasswordInfo;
@@ skipping 594 matching lines @@
   WebDatabase* db_;
 
   // Whether the database failed to initialize.  We use this to avoid
   // continually trying to reinit.
   bool failed_init_;
 
   // Whether we should commit the database.
   bool should_commit_;
 
   // A lock to protect pending requests and next request handle.
-  Lock pending_lock_;
+  base::Lock pending_lock_;
 
   // Next handle to be used for requests. Incremented for each use.
   Handle next_request_handle_;
 
   typedef std::map<Handle, WebDataRequest*> RequestMap;
   RequestMap pending_requests_;
 
   // MessageLoop the WebDataService is created on.
   MessageLoop* main_loop_;
 
@@ skipping 16 matching lines @@
   // result can be NULL, if no result is expected or if the database could
   // not be opened. The result object is destroyed after this call.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) = 0;
 
  protected:
   virtual ~WebDataServiceConsumer() {}
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__