gdata: Fix GDataFileSystem::GetCacheStateOnUIThread to acquire lock for cache initialization.

chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

 // Copyright (c) 2012 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 <errno.h>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 511 matching lines @@
 
     RunAllPendingForIO();
   }
 
   void TestGetCacheState(const std::string& resource_id, const std::string& md5,
                          base::PlatformFileError expected_error,
                          int expected_cache_state, GDataFile* expected_file) {
     expected_error_ = expected_error;
     expected_cache_state_ = expected_cache_state;
 
-    {  // Lock to use GetCacheState, but release before flushing tasks because
-       // OnGetCacheState callback will attempt to lock.
-      base::AutoLock lock(file_system_->lock_);
-      file_system_->GetCacheState(resource_id, md5,
-          base::Bind(&GDataFileSystemTest::VerifyGetCacheState,
-                     base::Unretained(this)));
-    }
+    file_system_->GetCacheState(resource_id, md5,
+        base::Bind(&GDataFileSystemTest::VerifyGetCacheState,
+                   base::Unretained(this)));
 
     RunAllPendingForIO();
   }
 
   void VerifyGetCacheState(base::PlatformFileError error, int cache_state) {
     ++num_callback_invocations_;
 
     EXPECT_EQ(expected_error_, error);
 
     if (error == base::PLATFORM_FILE_OK) {
@@ skipping 2406 matching lines @@
   EXPECT_EQ(1, num_callback_invocations_);
   EXPECT_TRUE(CacheEntryExists(resource_id, md5));
 
   // Try to remove the file.
   num_callback_invocations_ = 0;
   TestRemoveFromCache(resource_id, base::PLATFORM_FILE_OK);
   EXPECT_EQ(1, num_callback_invocations_);
 }
 
 }   // namespace gdata