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

chrome/browser/chromeos/dom_ui/system_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/chromeos/dom_ui/system_settings_provider.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
-#include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "grit/generated_resources.h"
 #include "unicode/calendar.h"
 #include "unicode/timezone.h"
@@ skipping 87 matching lines @@
     "Australia/Hobart",
     "Australia/Sydney",
     "Asia/Vladivostok",
     "Pacific/Guam",
     "Asia/Magadan",
     "Pacific/Auckland",
     "Pacific/Fiji",
     "Pacific/Tongatapu",
 };
 
-static Lock timezone_bundle_lock;
+static base::Lock timezone_bundle_lock;
 
 struct UResClose {
   inline void operator() (UResourceBundle* b) const {
     ures_close(b);
   }
 };
 
 string16 GetExemplarCity(const icu::TimeZone& zone) {
   // TODO(jungshik): After upgrading to ICU 4.6, use U_ICUDATA_ZONE
   static const char* zone_bundle_name = NULL;
 
   // These will be leaked at the end.
   static UResourceBundle *zone_bundle = NULL;
   static UResourceBundle *zone_strings = NULL;
 
   UErrorCode status = U_ZERO_ERROR;
   {
-    AutoLock lock(timezone_bundle_lock);
+    base::AutoLock lock(timezone_bundle_lock);
     if (zone_bundle == NULL)
       zone_bundle = ures_open(zone_bundle_name, uloc_getDefault(), &status);
 
     if (zone_strings == NULL)
       zone_strings = ures_getByKey(zone_bundle, "zone_strings", NULL, &status);
   }
 
   icu::UnicodeString zone_id;
   zone.getID(zone_id);
   std::string zone_id_str;
@@ skipping 155 matching lines @@
     const icu::TimeZone* known_timezone = *iter;
     if (known_timezone->hasSameRules(timezone))
       return GetTimezoneID(*known_timezone);
   }
 
   // Not able to find a matching timezone in our list.
   return string16();
 }
 
 }  // namespace chromeos