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

chrome/browser/geolocation/gateway_data_provider_common.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_GEOLOCATION_GATEWAY_DATA_PROVIDER_COMMON_H_
 #define CHROME_BROWSER_GEOLOCATION_GATEWAY_DATA_PROVIDER_COMMON_H_
 #pragma once
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 65 matching lines @@
 
   // Thread implementation.
   virtual void Init();
   virtual void CleanUp();
 
   // Task which run in the child thread.
   void DoRouterScanTask();
   // Will schedule a scan; i.e. enqueue DoRouterScanTask deferred task.
   void ScheduleNextScan(int interval);
 
-  Lock data_mutex_;
+  base::Lock data_mutex_;
   // Whether we've successfully completed a scan for gateway data (or the
   // polling thread has terminated early).
   bool is_first_scan_complete_;
   // Underlying OS gateway API.
   scoped_ptr<GatewayApiInterface> gateway_api_;
   GatewayData gateway_data_;
   // Controls the polling update interval.
   scoped_ptr<GatewayPollingPolicyInterface> polling_policy_;
   // Holder for the tasks which run on the thread; takes care of cleanup.
   ScopedRunnableMethodFactory<GatewayDataProviderCommon> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GatewayDataProviderCommon);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_GATEWAY_DATA_PROVIDER_COMMON_H_