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

chrome/browser/content_settings/policy_content_settings_provider.cc

 // 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.
 
 #include "chrome/browser/content_settings/policy_content_settings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_thread.h"
@@ skipping 53 matching lines @@
   notification_registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
                               Source<Profile>(profile_));
 }
 
 PolicyContentSettingsProvider::~PolicyContentSettingsProvider() {
   UnregisterObservers();
 }
 
 bool PolicyContentSettingsProvider::CanProvideDefaultSetting(
     ContentSettingsType content_type) const {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   if (managed_default_content_settings_.settings[content_type] !=
       CONTENT_SETTING_DEFAULT) {
     return true;
   } else {
     return false;
   }
 }
 
 ContentSetting PolicyContentSettingsProvider::ProvideDefaultSetting(
     ContentSettingsType content_type) const {
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   return managed_default_content_settings_.settings[content_type];
 }
 
 void PolicyContentSettingsProvider::UpdateDefaultSetting(
     ContentSettingsType content_type,
     ContentSetting setting) {
 }
 
 bool PolicyContentSettingsProvider::DefaultSettingIsManaged(
     ContentSettingsType content_type) const {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   if (managed_default_content_settings_.settings[content_type] !=
       CONTENT_SETTING_DEFAULT) {
     return true;
   } else {
     return false;
   }
 }
 
 void PolicyContentSettingsProvider::ResetToDefaults() {
 }
@@ skipping 69 matching lines @@
     ContentSettingsType type) {
   // If a pref to manage a default-content-setting was not set (NOTICE:
   // "HasPrefPath" returns false if no value was set for a registered pref) then
   // the default value of the preference is used. The default value of a
   // preference to manage a default-content-settings is
   // CONTENT_SETTING_DEFAULT. This indicates that no managed value is set. If a
   // pref was set, than it MUST be managed.
   PrefService* prefs = profile_->GetPrefs();
   DCHECK(!prefs->HasPrefPath(kPrefToManageType[type]) ||
           prefs->IsManagedPreference(kPrefToManageType[type]));
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   managed_default_content_settings_.settings[type] = IntToContentSetting(
       prefs->GetInteger(kPrefToManageType[type]));
 }
 
 // static
 void PolicyContentSettingsProvider::RegisterUserPrefs(PrefService* prefs) {
   // Preferences for default content setting policies. A policy is not set of
   // the corresponding preferences below is set to CONTENT_SETTING_DEFAULT.
   prefs->RegisterIntegerPref(prefs::kManagedDefaultCookiesSetting,
       CONTENT_SETTING_DEFAULT);
   prefs->RegisterIntegerPref(prefs::kManagedDefaultImagesSetting,
       CONTENT_SETTING_DEFAULT);
   prefs->RegisterIntegerPref(prefs::kManagedDefaultJavaScriptSetting,
       CONTENT_SETTING_DEFAULT);
   prefs->RegisterIntegerPref(prefs::kManagedDefaultPluginsSetting,
       CONTENT_SETTING_DEFAULT);
   prefs->RegisterIntegerPref(prefs::kManagedDefaultPopupsSetting,
       CONTENT_SETTING_DEFAULT);
 }