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

base/metrics/stats_table.h

 // Copyright (c) 2011 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.
 //
 // A StatsTable is a table of statistics.  It can be used across multiple
 // processes and threads, maintaining cheap statistics counters without
 // locking.
 //
 // The goal is to make it very cheap and easy for developers to add
 // counters to code, without having to build one-off utilities or mechanisms
 // to track the counters, and also to allow a single "view" to display
 // the contents of all counters.
 //
 // To achieve this, StatsTable creates a shared memory segment to store
 // the data for the counters.  Upon creation, it has a specific size
 // which governs the maximum number of counters and concurrent
 // threads/processes which can use it.
 //
 
 #ifndef BASE_METRICS_STATS_TABLE_H_
 #define BASE_METRICS_STATS_TABLE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
 #include "base/threading/thread_local_storage.h"
 
 namespace base {
 
 class StatsTable {
  public:
   // Create a new StatsTable.
   // If a StatsTable already exists with the specified name, this StatsTable
   // will use the same shared memory segment as the original.  Otherwise,
   // a new StatsTable is created and all counters are zeroed.
@@ skipping 129 matching lines @@
   // On failure, returns 0.
   int AddCounter(const std::string& name);
 
   // Get the TLS data for the calling thread.  Returns NULL if none is
   // initialized.
   TLSData* GetTLSData() const;
 
   Private* impl_;
 
   // The counters_lock_ protects the counters_ hash table.
-  Lock counters_lock_;
+  base::Lock counters_lock_;
 
   // The counters_ hash map is an in-memory hash of the counters.
   // It is used for quick lookup of counters, but is cannot be used
   // as a substitute for what is in the shared memory.  Even though
   // we don't have a counter in our hash table, another process may
   // have created it.
   CountersMap counters_;
   ThreadLocalStorage::Slot tls_index_;
 
   static StatsTable* global_table_;
 
   DISALLOW_COPY_AND_ASSIGN(StatsTable);
 };
 
 }  // namespace base
 
 #endif  // BASE_METRICS_STATS_TABLE_H_