projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
sync_file_system
/
drive_backend
/
sync_engine_unittest.cc
diff --git
a/src/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
b/src/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
index
ff6d5df
..
19d87ab
100644
(file)
--- a/
src/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
+++ b/
src/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
@@
-19,6
+19,8
@@
#include "extensions/common/extension_set.h"
#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "extensions/common/extension_set.h"
#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
+#include "third_party/leveldatabase/src/include/leveldb/env.h"
namespace sync_file_system {
namespace drive_backend {
namespace sync_file_system {
namespace drive_backend {
@@
-58,10
+60,6
@@
class MockExtensionService : public TestExtensionService {
return &extensions_;
}
return &extensions_;
}
- virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE {
- return &disabled_extensions_;
- }
-
virtual void AddExtension(const extensions::Extension* extension) OVERRIDE {
extensions_.Insert(make_scoped_refptr(extension));
}
virtual void AddExtension(const extensions::Extension* extension) OVERRIDE {
extensions_.Insert(make_scoped_refptr(extension));
}
@@
-105,6
+103,8
@@
class SyncEngineTest
virtual void SetUp() OVERRIDE {
ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
virtual void SetUp() OVERRIDE {
ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
+ in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
+
extension_service_.reset(new MockExtensionService);
scoped_ptr<drive::FakeDriveService> fake_drive_service(
new drive::FakeDriveService);
extension_service_.reset(new MockExtensionService);
scoped_ptr<drive::FakeDriveService> fake_drive_service(
new drive::FakeDriveService);
@@
-120,7
+120,8
@@
class SyncEngineTest
scoped_ptr<drive::DriveUploaderInterface>(),
NULL /* notification_manager */,
extension_service_.get(),
scoped_ptr<drive::DriveUploaderInterface>(),
NULL /* notification_manager */,
extension_service_.get(),
- NULL /* auth_token_service */));
+ NULL /* auth_token_service */,
+ in_memory_env_.get()));
sync_engine_->Initialize();
base::RunLoop().RunUntilIdle();
}
sync_engine_->Initialize();
base::RunLoop().RunUntilIdle();
}
@@
-152,6
+153,7
@@
class SyncEngineTest
private:
content::TestBrowserThreadBundle browser_threads_;
base::ScopedTempDir profile_dir_;
private:
content::TestBrowserThreadBundle browser_threads_;
base::ScopedTempDir profile_dir_;
+ scoped_ptr<leveldb::Env> in_memory_env_;
scoped_ptr<MockExtensionService> extension_service_;
scoped_ptr<drive_backend::SyncEngine> sync_engine_;
scoped_ptr<MockExtensionService> extension_service_;
scoped_ptr<drive_backend::SyncEngine> sync_engine_;