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

chrome/browser/content_settings/pref_content_settings_provider.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_CONTENT_SETTINGS_PREF_CONTENT_SETTINGS_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_PREF_CONTENT_SETTINGS_PROVIDER_H_
 #pragma once
 
 // A content settings provider that takes its settings out of the pref service.
 
 #include "base/basictypes.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 class ContentSettingsDetails;
 class DictionaryValue;
 class PrefService;
 class Profile;
 
@@ skipping 43 matching lines @@
   // Copies of the pref data, so that we can read it on the IO thread.
   ContentSettings default_content_settings_;
 
   Profile* profile_;
 
   // Whether this settings map is for an OTR session.
   bool is_off_the_record_;
 
   // Used around accesses to the default_content_settings_ object to guarantee
   // thread safety.
-  mutable Lock lock_;
+  mutable base::Lock lock_;
 
   PrefChangeRegistrar pref_change_registrar_;
   NotificationRegistrar notification_registrar_;
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefContentSettingsProvider);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_PREF_CONTENT_SETTINGS_PROVIDER_H_