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

net/base/test_completion_callback_unittest.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.
 
 // Illustrates how to use worker threads that issue completion callbacks
 
 #include "base/threading/worker_pool.h"
 #include "net/base/completion_callback.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 37 matching lines @@
   void DoCallback();
  private:
   friend class base::RefCountedThreadSafe<ExampleWorker>;
 
   ~ExampleWorker() {}
 
   // Only used on the origin thread (where DoSomething was called).
   ExampleEmployer* employer_;
   CompletionCallback* callback_;
   // Used to post ourselves onto the origin thread.
-  Lock origin_loop_lock_;
+  base::Lock origin_loop_lock_;
   MessageLoop* origin_loop_;
 };
 
 void ExampleEmployer::ExampleWorker::DoWork() {
   // Running on the worker thread
   // In a real worker thread, some work would be done here.
   // Pretend it is, and send the completion callback.
   Task* reply = NewRunnableMethod(this, &ExampleWorker::DoCallback);
 
   // The origin loop could go away while we are trying to post to it, so we
   // need to call its PostTask method inside a lock.  See ~ExampleEmployer.
   {
-    AutoLock locked(origin_loop_lock_);
+    base::AutoLock locked(origin_loop_lock_);
     if (origin_loop_) {
       origin_loop_->PostTask(FROM_HERE, reply);
       reply = NULL;
     }
   }
 
   // Does nothing if it got posted.
   delete reply;
 }
 
@@ skipping 33 matching lines @@
 TEST_F(TestCompletionCallbackTest, Simple) {
   ExampleEmployer boss;
   TestCompletionCallback callback;
   bool queued = boss.DoSomething(&callback);
   EXPECT_EQ(queued, true);
   int result = callback.WaitForResult();
   EXPECT_EQ(result, kMagicResult);
 }
 
 // TODO: test deleting ExampleEmployer while work outstanding