X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fxwalk%2Fapplication%2Fcommon%2Fapplication_file_util_unittest.cc;h=163a844b97d55f30e3687f642d1dc307282e4575;hb=9f86df81fcd247bd2ce7c9a96196804f8d160474;hp=c2542d676a90ed27e0e9300dcc0e581ecfcf0abc;hpb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/xwalk/application/common/application_file_util_unittest.cc b/src/xwalk/application/common/application_file_util_unittest.cc index c2542d6..163a844 100644 --- a/src/xwalk/application/common/application_file_util_unittest.cc +++ b/src/xwalk/application/common/application_file_util_unittest.cc @@ -41,7 +41,7 @@ TEST_F(ApplicationFileUtilTest, LoadApplicationWithValidPath) { std::string error; scoped_refptr application(LoadApplication( - install_dir, Manifest::COMMAND_LINE, &error)); + install_dir, ApplicationData::LOCAL_DIRECTORY, &error)); ASSERT_TRUE(application != NULL); EXPECT_EQ("The first application that I made.", application->Description()); } @@ -60,7 +60,7 @@ TEST_F(ApplicationFileUtilTest, std::string error; scoped_refptr application(LoadApplication( - install_dir, Manifest::COMMAND_LINE, &error)); + install_dir, ApplicationData::LOCAL_DIRECTORY, &error)); ASSERT_TRUE(application == NULL); ASSERT_FALSE(error.empty()); ASSERT_STREQ("Manifest file is missing or unreadable.", error.c_str()); @@ -80,7 +80,7 @@ TEST_F(ApplicationFileUtilTest, std::string error; scoped_refptr application(LoadApplication( - install_dir, Manifest::COMMAND_LINE, &error)); + install_dir, ApplicationData::LOCAL_DIRECTORY, &error)); ASSERT_TRUE(application == NULL); ASSERT_FALSE(error.empty()); ASSERT_STREQ("Manifest is not valid JSON." @@ -91,7 +91,7 @@ TEST_F(ApplicationFileUtilTest, static scoped_refptr LoadApplicationManifest( base::DictionaryValue* manifest, const base::FilePath& manifest_dir, - Manifest::SourceType location, + ApplicationData::SourceType location, int extra_flags, std::string* error) { scoped_refptr application = ApplicationData::Create( @@ -102,7 +102,7 @@ static scoped_refptr LoadApplicationManifest( static scoped_refptr LoadApplicationManifest( const std::string& manifest_value, const base::FilePath& manifest_dir, - Manifest::SourceType location, + ApplicationData::SourceType location, int extra_flags, std::string* error) { JSONStringValueSerializer serializer(manifest_value); @@ -135,7 +135,7 @@ TEST_F(ApplicationFileUtilTest, ValidateThemeUTF8) { "}", non_ascii_file.c_str()); std::string error; scoped_refptr application = LoadApplicationManifest( - kManifest, temp.path(), Manifest::COMMAND_LINE, 0, &error); + kManifest, temp.path(), ApplicationData::LOCAL_DIRECTORY, 0, &error); ASSERT_TRUE(application.get()) << error; }