drive: Also lock SearchOperation when locking ChangeListLoader

chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc

 // Copyright 2013 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/drive/sync/entry_update_performer.h"
 
 #include "base/callback_helpers.h"
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/task_runner_util.h"
@@ skipping 13 matching lines @@
 
 class EntryUpdatePerformerTest : public file_system::OperationTestBase {
  protected:
   virtual void SetUp() OVERRIDE {
     OperationTestBase::SetUp();
     performer_.reset(new EntryUpdatePerformer(blocking_task_runner(),
                                               observer(),
                                               scheduler(),
                                               metadata(),
                                               cache(),
-                                              change_list_loader()));
+                                              loader_controller()));
   }
 
   // Stores |content| to the cache and mark it as dirty.
   FileError StoreAndMarkDirty(const std::string& local_id,
                               const std::string& content) {
     base::FilePath path;
     if (!base::CreateTemporaryFileInDir(temp_dir(), &path) ||
         !google_apis::test_util::WriteStringToFile(path, content))
       return FILE_ERROR_FAILED;
 
@@ skipping 367 matching lines @@
                  local_id,
                  &cache_entry),
       google_apis::test_util::CreateCopyResultCallback(&success));
   test_util::RunBlockingPoolTask();
   EXPECT_TRUE(success);
   EXPECT_FALSE(cache_entry.is_dirty());
 }
 
 }  // namespace internal
 }  // namespace drive