[M120 Migration][XWalkExtension] Support IME in xwalk exension

[platform/framework/web/chromium-efl.git] / apps / saved_files_service_unittest.cc

diff --git a/apps/saved_files_service_unittest.cc b/apps/saved_files_service_unittest.cc
index 3d7c373..f4a9366 100644 (file)
--- a/apps/saved_files_service_unittest.cc
+++ b/apps/saved_files_service_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,7 @@
 
 #include "apps/saved_files_service.h"
 #include "base/files/file_path.h"
+#include "base/memory/raw_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/values_test_util.h"
 #include "base/values.h"
@@ -29,7 +30,7 @@ using extensions::SavedFileEntry;
 namespace {
 
 std::string GenerateId(int i) {
-  return base::IntToString(i) + ":filename.ext";
+  return base::NumberToString(i) + ":filename.ext";
 }
 
 }  // namespace
@@ -37,8 +38,7 @@ std::string GenerateId(int i) {
 class SavedFilesServiceUnitTest : public testing::Test {
  protected:
   void SetUp() override {
-    testing::Test::SetUp();
-    extension_ = env_.MakeExtension(*base::test::ParseJson(
+    static const char kManifest[] =
         "{"
         "  \"app\": {"
         "    \"background\": {"
@@ -48,7 +48,9 @@ class SavedFilesServiceUnitTest : public testing::Test {
         "  \"permissions\": ["
         "    {\"fileSystem\": [\"retainEntries\"]}"
         "  ]"
-        "}"));
+        "}";
+    testing::Test::SetUp();
+    extension_ = env_.MakeExtension(base::test::ParseJsonDict(kManifest));
     service_ = SavedFilesService::Get(env_.profile());
     path_ = base::FilePath(FILE_PATH_LITERAL("filename.ext"));
   }
@@ -82,8 +84,8 @@ class SavedFilesServiceUnitTest : public testing::Test {
   }
 
   extensions::TestExtensionEnvironment env_;
-  const extensions::Extension* extension_;
-  SavedFilesService* service_;
+  raw_ptr<const extensions::Extension> extension_;
+  raw_ptr<SavedFilesService> service_;
   base::FilePath path_;
 };
 
@@ -147,9 +149,11 @@ TEST_F(SavedFilesServiceUnitTest, RetainTwoFilesTest) {
 }
 
 TEST_F(SavedFilesServiceUnitTest, NoRetainEntriesPermissionTest) {
-  extension_ = env_.MakeExtension(*base::test::ParseJson(
+  static const char kManifest[] =
       "{\"app\": {\"background\": {\"scripts\": [\"background.js\"]}},"
-      "\"permissions\": [\"fileSystem\"]}"));
+      "\"permissions\": [\"fileSystem\"]}";
+  extension_ = nullptr;
+  extension_ = env_.MakeExtension(base::test::ParseJsonDict(kManifest));
   service_->RegisterFileEntry(extension_->id(), GenerateId(1), path_, true);
   TRACE_CALL(CheckEntrySequenceNumber(1, 0));
   SavedFileEntry entry;