[SyncFS] Drop test only un-thread-safe getters from SyncEngine (4)

chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc

 // Copyright 2014 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 <algorithm>
 #include <stack>
 
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/drive/drive_uploader.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/drive/test_util.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
+#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_worker.h"
 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"
 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"
 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ skipping 524 matching lines @@
         base::Bind(&MetadataDatabase::CountFileTracker,
                    base::Unretained(metadata_database())),
         base::Bind(&SetValueAndCallClosure<size_t>,
                    run_loop.QuitClosure(), &count));
     run_loop.Run();
     return count;
   }
 
   drive::FakeDriveService* fake_drive_service() {
     return static_cast<drive::FakeDriveService*>(
-        remote_sync_service_->GetDriveService());
+        remote_sync_service_->drive_service_.get());
   }
 
   FakeDriveServiceHelper* fake_drive_service_helper() {
     return fake_drive_service_helper_.get();
   }
 
  private:
-  // NOTE: Member functions of MetadataDatabase class must not be called
-  // directly through this method.  Call them via PostTask.
+  // SyncEngineContext is normally used on the worker thread.
+  // Use this only when there is no task running on the worker.
+  SyncEngineContext* context() {

[peria, 2014/06/10 03:18:15]

This method is used only in metadata_database().
Would you merge them?

[tzik, 2014/06/10 03:53:22]

Done.

+    return remote_sync_service_->sync_worker_->context_.get();
+  }
+
+  // MetadataDatabase is normally used on the worker thread.
+  // Use this only when there is no task running on the worker.
   MetadataDatabase* metadata_database() {

[peria, 2014/06/10 03:18:15]

This change seems to be independent from the objective of this CL.
Could you make another CL for this?

[tzik, 2014/06/10 03:53:23]

Done.

-    return remote_sync_service_->sync_worker_->GetMetadataDatabase();
+    return context()->metadata_database_.get();
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
 
   base::ScopedTempDir base_dir_;
   scoped_ptr<leveldb::Env> in_memory_env_;
   TestingProfile profile_;
 
   scoped_ptr<SyncEngine> remote_sync_service_;
   scoped_ptr<LocalFileSyncService> local_sync_service_;
@@ skipping 1091 matching lines @@
 
   EXPECT_EQ(1u, CountApp());
   EXPECT_EQ(1u, CountLocalFile(app_id));
 
   EXPECT_EQ(2u, CountMetadata());
   EXPECT_EQ(2u, CountTracker());
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system