Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / extensions / browser / value_store / value_store_frontend_unittest.cc

diff --git a/src/extensions/browser/value_store/value_store_frontend_unittest.cc b/src/extensions/browser/value_store/value_store_frontend_unittest.cc
index 3d81a1d..e7a81a6 100644 (file)
--- a/src/extensions/browser/value_store/value_store_frontend_unittest.cc
+++ b/src/extensions/browser/value_store/value_store_frontend_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
-#include "chrome/common/chrome_paths.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/browser/value_store/value_store_frontend.h"
+#include "extensions/common/extension_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
@@ -25,7 +25,7 @@ class ValueStoreFrontendTest : public testing::Test {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     base::FilePath test_data_dir;
-    ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+    ASSERT_TRUE(PathService::Get(extensions::DIR_TEST_DATA, &test_data_dir));
     base::FilePath src_db(test_data_dir.AppendASCII("value_store_db"));
     db_path_ = temp_dir_.path().AppendASCII("temp_db");
     base::CopyDirectory(src_db, db_path_, true);
@@ -86,10 +86,8 @@ TEST_F(ValueStoreFrontendTest, GetExistingData) {
 }
 
 TEST_F(ValueStoreFrontendTest, ChangesPersistAfterReload) {
-  storage_->Set("key0",
-      scoped_ptr<base::Value>(base::Value::CreateIntegerValue(0)));
-  storage_->Set("key1",
-      scoped_ptr<base::Value>(base::Value::CreateStringValue("new1")));
+  storage_->Set("key0", scoped_ptr<base::Value>(new base::FundamentalValue(0)));
+  storage_->Set("key1", scoped_ptr<base::Value>(new base::StringValue("new1")));
   storage_->Remove("key2");
 
   // Reload the DB and test our changes.