Upstream version 11.39.256.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / common / manifest_handlers / tizen_navigation_handler_unittest.cc

diff --git a/src/xwalk/application/common/manifest_handlers/tizen_navigation_handler_unittest.cc b/src/xwalk/application/common/manifest_handlers/tizen_navigation_handler_unittest.cc
index 288c22c..590527c 100644 (file)
--- a/src/xwalk/application/common/manifest_handlers/tizen_navigation_handler_unittest.cc
+++ b/src/xwalk/application/common/manifest_handlers/tizen_navigation_handler_unittest.cc
@@ -1,16 +1,16 @@
 // Copyright (c) 2014 Intel Corporation. All rights reserved.
+// Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "xwalk/application/common/manifest_handlers/tizen_navigation_handler.h"
-
 #include <string>
 #include <vector>
 #include "base/memory/scoped_ptr.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "xwalk/application/common/application_manifest_constants.h"
 #include "xwalk/application/common/manifest.h"
 #include "xwalk/application/common/manifest_handlers/unittest_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "xwalk/application/common/manifest_handlers/tizen_navigation_handler.h"
 
 namespace xwalk {
 
@@ -33,16 +33,18 @@ class TizenNavigationHandlerTest: public testing::Test {
 };
 
 TEST_F(TizenNavigationHandlerTest, NoNavigation) {
-  scoped_ptr<base::DictionaryValue> manifest = CreateDefaultWGTManifest();
-  scoped_refptr<ApplicationData> application = CreateApplication(*manifest);
+  scoped_ptr<base::DictionaryValue> manifest = CreateDefaultWidgetConfig();
+  scoped_refptr<ApplicationData> application =
+      CreateApplication(Manifest::TYPE_WIDGET, *manifest);
   EXPECT_TRUE(application.get());
   EXPECT_FALSE(GetNavigationInfo(application));
 }
 
 TEST_F(TizenNavigationHandlerTest, OneNavigation) {
-  scoped_ptr<base::DictionaryValue> manifest = CreateDefaultWGTManifest();
+  scoped_ptr<base::DictionaryValue> manifest = CreateDefaultWidgetConfig();
   manifest->SetString(keys::kAllowNavigationKey, "http://www.sample.com");
-  scoped_refptr<ApplicationData> application = CreateApplication(*manifest);
+  scoped_refptr<ApplicationData> application =
+      CreateApplication(Manifest::TYPE_WIDGET, *manifest);
   EXPECT_TRUE(application.get());
   EXPECT_EQ(application->GetManifest()->type(), Manifest::TYPE_WIDGET);
   const TizenNavigationInfo* info = GetNavigationInfo(application);
@@ -52,10 +54,11 @@ TEST_F(TizenNavigationHandlerTest, OneNavigation) {
 }
 
 TEST_F(TizenNavigationHandlerTest, Navigations) {
-  scoped_ptr<base::DictionaryValue> manifest = CreateDefaultWGTManifest();
+  scoped_ptr<base::DictionaryValue> manifest = CreateDefaultWidgetConfig();
   manifest->SetString(keys::kAllowNavigationKey,
                       "http://www.sample1.com www.sample2.com");
-  scoped_refptr<ApplicationData> application = CreateApplication(*manifest);
+  scoped_refptr<ApplicationData> application =
+      CreateApplication(Manifest::TYPE_WIDGET, *manifest);
   EXPECT_TRUE(application.get());
   EXPECT_EQ(application->GetManifest()->type(), Manifest::TYPE_WIDGET);
   const TizenNavigationInfo* info = GetNavigationInfo(application);