Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / requirements_checker_browsertest.cc

diff --git a/src/chrome/browser/extensions/requirements_checker_browsertest.cc b/src/chrome/browser/extensions/requirements_checker_browsertest.cc
index 73bbfbd..590498f 100644 (file)
--- a/src/chrome/browser/extensions/requirements_checker_browsertest.cc
+++ b/src/chrome/browser/extensions/requirements_checker_browsertest.cc
@@ -15,10 +15,10 @@
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/requirements_checker.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/file_util.h"
 #include "gpu/config/gpu_info.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -35,9 +35,8 @@ class RequirementsCheckerBrowserTest : public ExtensionBrowserTest {
     PathService::Get(chrome::DIR_TEST_DATA, &extension_path);
     extension_path = extension_path.AppendASCII("requirements_checker")
                                    .AppendASCII(extension_dir_name);
-    scoped_refptr<const Extension> extension =
-        extension_file_util::LoadExtension(extension_path, Manifest::UNPACKED,
-                                           0, &load_error);
+    scoped_refptr<const Extension> extension = file_util::LoadExtension(
+        extension_path, Manifest::UNPACKED, 0, &load_error);
     CHECK(load_error.length() == 0u);
     return extension;
   }
@@ -89,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, CheckNpapiExtension) {
   ASSERT_TRUE(extension.get());
 
   std::vector<std::string> expected_errors;
-  // npapi plugins are dissalowd on CROMEOS.
+  // NPAPI plugins are disallowed on ChromeOS.
 #if defined(OS_CHROMEOS)
   expected_errors.push_back(l10n_util::GetStringUTF8(
       IDS_EXTENSION_NPAPI_NOT_SUPPORTED));
@@ -101,21 +100,17 @@ IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, CheckNpapiExtension) {
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
 }
 
-IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, DisallowCSS3D) {
+IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest,
+                       CheckWindowShapeExtension) {
   scoped_refptr<const Extension> extension(
-      LoadExtensionFromDirName("require_3d"));
+      LoadExtensionFromDirName("require_window_shape"));
   ASSERT_TRUE(extension.get());
 
-
-  // Blacklist css3d
-  std::vector<std::string> blacklisted_features;
-  blacklisted_features.push_back("accelerated_compositing");
-  BlackListGPUFeatures(blacklisted_features);
-  content::BrowserThread::GetBlockingPool()->FlushForTesting();
-
   std::vector<std::string> expected_errors;
+#if !defined(USE_AURA)
   expected_errors.push_back(l10n_util::GetStringUTF8(
-      IDS_EXTENSION_CSS3D_NOT_SUPPORTED));
+      IDS_EXTENSION_WINDOW_SHAPE_NOT_SUPPORTED));
+#endif  // !defined(USE_AURA)
 
   checker_.Check(extension, base::Bind(
       &RequirementsCheckerBrowserTest::ValidateRequirementErrors,
@@ -144,38 +139,21 @@ IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, DisallowWebGL) {
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
 }
 
-IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, DisallowGPUFeatures) {
+IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, Check3DExtension) {
   scoped_refptr<const Extension> extension(
       LoadExtensionFromDirName("require_3d"));
   ASSERT_TRUE(extension.get());
 
-  // Backlist both webgl and css3d
-  std::vector<std::string> blacklisted_features;
-  blacklisted_features.push_back("webgl");
-  blacklisted_features.push_back("accelerated_compositing");
-  BlackListGPUFeatures(blacklisted_features);
-  content::BrowserThread::GetBlockingPool()->FlushForTesting();
-
   std::vector<std::string> expected_errors;
-  expected_errors.push_back(l10n_util::GetStringUTF8(
-      IDS_EXTENSION_WEBGL_NOT_SUPPORTED));
-  expected_errors.push_back(l10n_util::GetStringUTF8(
-      IDS_EXTENSION_CSS3D_NOT_SUPPORTED));
-
-  checker_.Check(extension, base::Bind(
-      &RequirementsCheckerBrowserTest::ValidateRequirementErrors,
-      base::Unretained(this), expected_errors));
-  content::BrowserThread::GetBlockingPool()->FlushForTesting();
-}
 
-IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, Check3DExtension) {
-  scoped_refptr<const Extension> extension(
-      LoadExtensionFromDirName("require_3d"));
-  ASSERT_TRUE(extension.get());
+  if (!content::GpuDataManager::GetInstance()->GpuAccessAllowed(NULL)) {
+    expected_errors.push_back(l10n_util::GetStringUTF8(
+        IDS_EXTENSION_WEBGL_NOT_SUPPORTED));
+  }
 
   checker_.Check(extension, base::Bind(
       &RequirementsCheckerBrowserTest::ValidateRequirementErrors,
-      base::Unretained(this), std::vector<std::string>()));
+      base::Unretained(this), expected_errors));
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
 }