Merge 65722 - Split the private webstore install API into two parts....

chrome/browser/extensions/extension_gallery_install_apitest.cc

Index: chrome/browser/extensions/extension_gallery_install_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_gallery_install_apitest.cc	(revision 65899)
+++ chrome/browser/extensions/extension_gallery_install_apitest.cc	(working copy)
@@ -16,11 +16,27 @@
     command_line->AppendSwitchASCII(switches::kAppsGalleryURL,
         "http://www.example.com");
   }
+
+  bool RunInstallTest(const std::string& page) {
+    std::string base_url = base::StringPrintf(
+        "http://www.example.com:%u/files/extensions/",
+        test_server()->host_port_pair().port());
+
+    std::string testing_install_base_url = base_url;
+    testing_install_base_url += "good.crx";
+    CompleteInstallFunction::SetTestingInstallBaseUrl(
+        testing_install_base_url.c_str());
+
+    std::string page_url = base_url;
+    page_url += "api_test/extension_gallery_install/" + page;
+
+    return RunPageTest(page_url.c_str());
+  }
 };
 
 // http://crbug.com/55642 - failing on XP.
 #if defined (OS_WIN)
-#define MAYBE_InstallAndUninstall DISABLED_InstallAndUninstall
+#define MAYBE_InstallAndUninstall FLAKY_InstallAndUninstall
 #else
 #define MAYBE_InstallAndUninstall InstallAndUninstall
 #endif
@@ -29,15 +45,11 @@
   host_resolver()->AddRule("www.example.com", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
-  std::string base_url = base::StringPrintf(
-      "http://www.example.com:%u/files/extensions/",
-      test_server()->host_port_pair().port());
+  BeginInstallFunction::SetIgnoreUserGestureForTests(true);
+  ASSERT_TRUE(RunInstallTest("test.html"));
+  ASSERT_TRUE(RunInstallTest("complete_without_begin.html"));
+  ASSERT_TRUE(RunInstallTest("invalid_begin.html"));
 
-  std::string testing_install_base_url = base_url;
-  testing_install_base_url += "good.crx";
-  InstallFunction::SetTestingInstallBaseUrl(testing_install_base_url.c_str());
-
-  std::string page_url = base_url;
-  page_url += "api_test/extension_gallery_install/test.html";
-  ASSERT_TRUE(RunPageTest(page_url.c_str()));
+  BeginInstallFunction::SetIgnoreUserGestureForTests(false);
+  ASSERT_TRUE(RunInstallTest("no_user_gesture.html"));
 }