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

chrome/browser/sync/util/extensions_activity_monitor.cc

 // Copyright (c) 2009 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 "chrome/browser/sync/util/extensions_activity_monitor.h"
 
 #include "base/task.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/extensions/extension_bookmarks_module.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 47 matching lines @@
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     // The registrar calls RemoveAll in its dtor (which would happen in a
     // moment but explicitly call this so it is clear why we need to be on the
     // ui_loop_.
     registrar_.RemoveAll();
   }
 }
 
 void ExtensionsActivityMonitor::GetAndClearRecords(Records* buffer) {
-  AutoLock lock(records_lock_);
+  base::AutoLock lock(records_lock_);
   buffer->clear();
   buffer->swap(records_);
 }
 
 void ExtensionsActivityMonitor::PutRecords(const Records& records) {
-  AutoLock lock(records_lock_);
+  base::AutoLock lock(records_lock_);
   for (Records::const_iterator i = records.begin(); i != records.end(); ++i) {
     records_[i->first].extension_id = i->second.extension_id;
     records_[i->first].bookmark_write_count += i->second.bookmark_write_count;
   }
 }
 
 void ExtensionsActivityMonitor::Observe(NotificationType type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
-  AutoLock lock(records_lock_);
+  base::AutoLock lock(records_lock_);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const Extension* extension = Source<const Extension>(source).ptr();
   const BookmarksFunction* f = Details<const BookmarksFunction>(details).ptr();
   if (f->name() == "bookmarks.update" ||
       f->name() == "bookmarks.move" ||
       f->name() == "bookmarks.create" ||
       f->name() == "bookmarks.removeTree" ||
       f->name() == "bookmarks.remove") {
     Record& record = records_[extension->id()];
     record.extension_id = extension->id();
     record.bookmark_write_count++;
   }
 }
 
 }  // namespace browser_sync