Fix broken ExtensionCrxInstallerTest.GalleryInstallGetsExperimental test.

Fix broken ExtensionCrxInstallerTest.GalleryInstallGetsExperimental test.

Not sure what happened here, but I felt dirty when I checked that
crx in the first time, so just removed it.

BUG=105728
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=112367

[Yoyo Zhou, 2011-11-30 15:19:48]

Lgtm

Is it necessary to restore the original command line like this? Doesn't
seem like this is a common pattern.

composed on my Nexus One's onscreen keyboard
On Nov 29, 2011 8:48 PM, <aa@chromium.org> wrote:

> Reviewers: Yoyo Zhou,
>
> Description:
> Fix broken ExtensionCrxInstallerTest.**GalleryInstallGetsExperimental
> test.
>
> Not sure what happened here, but I felt dirty when I checked that
> crx in the first time, so just removed it.
>
> BUG=105728
>
>
> Please review this at
http://codereview.chromium.**org/8741004/<http://codereview.chromium.org/8741...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M chrome/browser/extensions/crx_**installer_browsertest.cc
>  D chrome/test/data/extensions/**experimental.crx
>  A chrome/test/data/extensions/**experimental/manifest.json
>
>
> Index: chrome/test/data/extensions/**experimental.crx
> diff --git a/chrome/test/data/extensions/**experimental.crx
> b/chrome/test/data/extensions/**experimental.crx
> deleted file mode 100644
> index e69de29bb2d1d6434b8b29ae775ad8**c2e48c5391..**
> 000000000000000000000000000000**0000000000
> Index: chrome/browser/extensions/crx_**installer_browsertest.cc
> diff --git a/chrome/browser/extensions/**crx_installer_browsertest.cc
> b/chrome/browser/extensions/**crx_installer_browsertest.cc
> index 3009d0d4e3887d974839a40b2aff32**c4713c98d9..**
> 9b51ee05aac94e6709854374264c15**e7f4de2acd 100644
> --- a/chrome/browser/extensions/**crx_installer_browsertest.cc
> +++ b/chrome/browser/extensions/**crx_installer_browsertest.cc
> @@ -8,6 +8,7 @@
>  #include "chrome/browser/extensions/**extension_service.h"
>  #include "chrome/browser/profiles/**profile.h"
>  #include "chrome/browser/ui/browser.h"
> +#include "chrome/common/chrome_**switches.h"
>  #include "chrome/test/base/ui_test_**utils.h"
>
>  class SkBitmap;
> @@ -77,9 +78,15 @@ IN_PROC_BROWSER_TEST_F(**ExtensionCrxInstallerTest,
> Whitelisting) {
>
>  // crbug.com/105728: Fails because the CRX is invalid.
>  IN_PROC_BROWSER_TEST_F(**ExtensionCrxInstallerTest,
> -                       FAILS_**GalleryInstallGetsExperimental**) {
> -  ASSERT_FALSE(InstallExtension(
> -      test_data_dir_.AppendASCII("**experimental.crx"), 0));
> -  ASSERT_TRUE(**InstallExtensionFromWebstore(
> -      test_data_dir_.AppendASCII("**experimental.crx"), 1));
> +                       GalleryInstallGetsExperimental**) {
> +  CommandLine* command_line = CommandLine::**ForCurrentProcess();
> +  CommandLine old_command_line = *command_line;
> +  command_line->AppendSwitch(**switches::**kEnableExperimentalExtensionAp
> **is);
> +  FilePath crx_path = PackExtension(
> +      test_data_dir_.AppendASCII("**experimental"));
> +  ASSERT_FALSE(crx_path.empty())**;
> +  *(CommandLine::**ForCurrentProcess()) = old_command_line;
> +
> +  EXPECT_FALSE(InstallExtension(**crx_path, 0));
> +  EXPECT_TRUE(**InstallExtensionFromWebstore(**crx_path, 1));
>  }
> Index: chrome/test/data/extensions/**experimental/manifest.json
> diff --git a/chrome/test/data/extensions/**experimental/manifest.json
> b/chrome/test/data/extensions/**experimental/manifest.json
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> 09fb1e159d9e70c2abd68bd3fba5ee**7a59a245a5
> --- /dev/null
> +++ b/chrome/test/data/extensions/**experimental/manifest.json
> @@ -0,0 +1,6 @@
> +{
> +  "name": "experimental test",
> +  "version": "1",
> +  "manifest_version": 2,
> +  "permissions": ["experimental"]
> +}
>
>
>

[Aaron Boodman, 2011-11-30 21:21:54]

On 2011/11/30 15:19:48, Yoyo Zhou wrote:
> Lgtm
> 
> Is it necessary to restore the original command line like this? Doesn't
> seem like this is a common pattern.

It is because I'm specifically trying to test that the webstore flag causes the
FROM_WEBSTORE flag allows experimental permissions. If I didn't reset the
command line, the --enable-experimental-extension-permissions flag would mask
failure of the test.

[Aaron Boodman, 2011-11-30 21:22:08]

I'll add a comment explaining it. It does look funny.

[Yoyo Zhou, 2011-11-30 22:58:58]

On 2011/11/30 21:22:08, Aaron Boodman wrote:
> I'll add a comment explaining it. It does look funny.

LGTM