From 24e042983baecad0fde78b5b1c5ab3fd5c942b3f Mon Sep 17 00:00:00 2001 From: "mihaip@chromium.org" Date: Fri, 10 Aug 2012 21:08:08 +0000 Subject: Check for warnings when loading extensions in browser tests. Test extension should be well-formed. Having warnings is often an early indicator that something else is wrong (see for example https://chromiumcodereview.appspot.com/10852016/). Review URL: https://chromiumcodereview.appspot.com/10826157 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151123 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_apitest.cc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'chrome/browser/extensions/extension_apitest.cc') diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index cf2821f..86a048a 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -121,6 +121,12 @@ bool ExtensionApiTest::RunExtensionTestIncognito(const char* extension_name) { extension_name, "", kFlagEnableIncognito | kFlagEnableFileAccess); } +bool ExtensionApiTest::RunExtensionTestIgnoreManifestWarnings( + const char* extension_name) { + return RunExtensionTestImpl( + extension_name, "", kFlagEnableFileAccess | kFlagIgnoreManifestWarnings); +} + bool ExtensionApiTest::RunComponentExtensionTest(const char* extension_name) { return RunExtensionTestImpl( extension_name, "", kFlagEnableFileAccess | kFlagLoadAsComponent); @@ -167,8 +173,6 @@ bool ExtensionApiTest::RunPlatformAppTest(const char* extension_name) { bool ExtensionApiTest::RunExtensionTestImpl(const char* extension_name, const std::string& page_url, int flags) { - bool enable_incognito = (flags & kFlagEnableIncognito) != 0; - bool enable_fileaccess = (flags & kFlagEnableFileAccess) != 0; bool load_as_component = (flags & kFlagLoadAsComponent) != 0; bool launch_platform_app = (flags & kFlagLaunchPlatformApp) != 0; bool use_incognito = (flags & kFlagUseIncognito) != 0; @@ -183,8 +187,14 @@ bool ExtensionApiTest::RunExtensionTestImpl(const char* extension_name, if (load_as_component) { extension = LoadExtensionAsComponent(extension_path); } else { - extension = LoadExtensionWithOptions(extension_path, - enable_incognito, enable_fileaccess); + int browser_test_flags = ExtensionBrowserTest::kFlagNone; + if (flags & kFlagEnableIncognito) + browser_test_flags |= ExtensionBrowserTest::kFlagEnableIncognito; + if (flags & kFlagEnableFileAccess) + browser_test_flags |= ExtensionBrowserTest::kFlagEnableFileAccess; + if (flags & kFlagIgnoreManifestWarnings) + browser_test_flags |= ExtensionBrowserTest::kFlagIgnoreManifestWarnings; + extension = LoadExtensionWithFlags(extension_path, browser_test_flags); } if (!extension) { message_ = "Failed to load extension."; -- cgit v1.1