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

base/i18n/file_util_icu.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.
 
 // File utilities that use the ICU library go in this file.
 
 #include "base/i18n/file_util_icu.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 72 matching lines @@
   static LocaleAwareComparator* GetInstance() {
     return Singleton<LocaleAwareComparator>::get();
   }
 
   // Note: A similar function is available in l10n_util.
   // We cannot use it because base should not depend on l10n_util.
   // TODO(yuzo): Move some of l10n_util to base.
   int Compare(const string16& a, const string16& b) {
     // We are not sure if Collator::compare is thread-safe.
     // Use an AutoLock just in case.
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
 
     UErrorCode error_code = U_ZERO_ERROR;
     UCollationResult result = collator_->compare(
         static_cast<const UChar*>(a.c_str()),
         static_cast<int>(a.length()),
         static_cast<const UChar*>(b.c_str()),
         static_cast<int>(b.length()),
         error_code);
     DCHECK(U_SUCCESS(error_code));
     return result;
   }
 
  private:
   LocaleAwareComparator() {
     UErrorCode error_code = U_ZERO_ERROR;
     // Use the default collator. The default locale should have been properly
     // set by the time this constructor is called.
     collator_.reset(icu::Collator::createInstance(error_code));
     DCHECK(U_SUCCESS(error_code));
     // Make it case-sensitive.
     collator_->setStrength(icu::Collator::TERTIARY);
     // Note: We do not set UCOL_NORMALIZATION_MODE attribute. In other words, we
     // do not pay performance penalty to guarantee sort order correctness for
     // non-FCD (http://unicode.org/notes/tn5/#FCD) file names. This should be a
     // reasonable tradeoff because such file names should be rare and the sort
     // order doesn't change much anyway.
   }
 
   scoped_ptr<icu::Collator> collator_;
-  Lock lock_;
+  base::Lock lock_;
   friend struct DefaultSingletonTraits<LocaleAwareComparator>;
 
   DISALLOW_COPY_AND_ASSIGN(LocaleAwareComparator);
 };
 
 }  // namespace
 
 namespace file_util {
 
 bool IsFilenameLegal(const string16& file_name) {
@@ skipping 57 matching lines @@
   // TODO(yuzo): Perhaps we should define SysNativeMBToUTF16?
   return LocaleAwareComparator::GetInstance()->Compare(
       WideToUTF16(base::SysNativeMBToWide(a.value().c_str())),
       WideToUTF16(base::SysNativeMBToWide(b.value().c_str()))) < 0;
 #else
   #error Not implemented on your system
 #endif
 }
 
 }  // namespace