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

chrome/common/net/gaia/gaia_authenticator.h

 // 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.
 //
 // Use this class to authenticate users with Gaia and access cookies sent
 // by the Gaia servers. This class cannot be used on its own becaue it relies
 // on a subclass to provide the virtual Post and GetBackoffDelaySeconds methods.
 //
 // Sample usage:
 // class ActualGaiaAuthenticator : public gaia::GaiaAuthenticator {
@@ skipping 232 matching lines @@
   inline std::string captcha_url() const {
     DCHECK_EQ(MessageLoop::current(), message_loop_);
     return auth_results_.captcha_url;
   }
 
   inline AuthResults results() const {
     DCHECK_EQ(MessageLoop::current(), message_loop_);
     return auth_results_;
   }
 
-  typedef EventChannel<GaiaAuthEvent, Lock> Channel;
+  typedef EventChannel<GaiaAuthEvent, base::Lock> Channel;
 
   inline Channel* channel() const {
     return channel_;
   }
 
  private:
   bool IssueAuthToken(AuthResults* results, const std::string& service_id);
 
   // Helper method to parse response when authentication succeeds.
   void ExtractTokensFrom(const std::string& response, AuthResults* results);
@@ skipping 30 matching lines @@
 #endif  // defined(OS_WIN)
   int early_auth_attempt_count_;
 
   // The message loop all our methods are invoked on.
   const MessageLoop* message_loop_;
 };
 
 }  // namespace gaia
 #endif  // CHROME_COMMON_NET_GAIA_GAIA_AUTHENTICATOR_H_