Pass on download or installation errors from WebstoreInstaller to the CompleteInstall function.

chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/bundle_installer.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/browser/gpu_blacklist.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "net/base/mock_host_resolver.h"
+#include "net/url_request/url_fetcher.h"
+#include "net/url_request/url_request.h"
+#include "net/url_request/url_request_job_manager.h"
+#include "net/url_request/url_request_test_job.h"
 #include "ui/gl/gl_switches.h"
 
 using content::GpuFeatureType;
 
 namespace utils = extension_function_test_utils;
 
 namespace extensions {
 
 namespace {
 
@@ skipping 38 matching lines @@
   const std::string& error() const { return error_; }
 
  private:
   bool received_failure_;
   bool received_success_;
   bool waiting_;
   std::string id_;
   std::string error_;
 };
 
+class EmptyRequestJob : public net::URLRequestTestJob {
+ public:
+  EmptyRequestJob(net::URLRequest* request,
+                  net::NetworkDelegate* network_delegate)
+      : net::URLRequestTestJob(request,
+                               network_delegate,
+                               net::URLRequestTestJob::test_headers(),
+                               std::string(),
+                               true) {
+  }
+
+  virtual int GetResponseCode() const { return 204; }
+
+ private:
+  ~EmptyRequestJob() {}
+};
+
+
+class EmptyCRXInterceptor
+    : public net::URLRequest::Interceptor,
+      public base::RefCountedThreadSafe<EmptyCRXInterceptor> {
+ public:
+  EmptyCRXInterceptor() {
+    net::URLRequestJobManager::GetInstance()->RegisterRequestInterceptor(this);
+  }
+
+  ~EmptyCRXInterceptor() {
+    net::URLRequestJobManager::GetInstance()->
+        UnregisterRequestInterceptor(this);
+  }
+
+  virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) OVERRIDE {

[asargent_no_longer_on_chrome, 2012/09/10 23:52:10]

formatting nit: 

http://dev.chromium.org/developers/coding-style#TOC-Code-formatting

"For function declarations and definitions, put each argument on a separate line
unless everything fits on one line."

+
+    if (request->url().scheme() != "http" ||
+        request->url().host() != "www.example.com")
+      return NULL;
+
+    if (!EndsWith(request->url().path(), ".crx", false))
+      return NULL;
+
+    return new EmptyRequestJob(request, network_delegate);
+  }
+};
+
+
 }  // namespace
 
 // A base class for tests below.
 class ExtensionWebstorePrivateApiTest : public ExtensionApiTest {
  public:
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
         switches::kAppsGalleryURL, "http://www.example.com");
     command_line->AppendSwitchASCII(
@@ skipping 188 matching lines @@
 }
 
 // Now test the case where the user cancels the confirmation dialog.
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, InstallCancelled) {
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kAppsGalleryInstallAutoConfirmForTests, "cancel");
   ASSERT_TRUE(RunInstallTest("cancelled.html", "extension.crx"));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, IncorrectManifest1) {
-  WebstoreInstallListener listener;
-  WebstorePrivateApi::SetWebstoreInstallerDelegateForTesting(&listener);
   ASSERT_TRUE(RunInstallTest("incorrect_manifest1.html", "extension.crx"));
-  listener.Wait();
-  ASSERT_TRUE(listener.received_failure());
-  ASSERT_EQ("Manifest file is invalid.", listener.error());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, IncorrectManifest2) {
-  WebstoreInstallListener listener;
-  WebstorePrivateApi::SetWebstoreInstallerDelegateForTesting(&listener);
   ASSERT_TRUE(RunInstallTest("incorrect_manifest2.html", "extension.crx"));
-  listener.Wait();
-  EXPECT_TRUE(listener.received_failure());
-  ASSERT_EQ("Manifest file is invalid.", listener.error());
 }
 
 // Tests that we can request an app installed bubble (instead of the default
 // UI when an app is installed).
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, AppInstallBubble) {
   WebstoreInstallListener listener;
   WebstorePrivateApi::SetWebstoreInstallerDelegateForTesting(&listener);
   ASSERT_TRUE(RunInstallTest("app_install_bubble.html", "app.crx"));
   listener.Wait();
   ASSERT_TRUE(listener.received_success());
@@ skipping 29 matching lines @@
 // Tests that themes are installed without an install prompt.
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, InstallTheme) {
   WebstoreInstallListener listener;
   WebstorePrivateApi::SetWebstoreInstallerDelegateForTesting(&listener);
   ASSERT_TRUE(RunInstallTest("theme.html", "../../../theme.crx"));
   listener.Wait();
   ASSERT_TRUE(listener.received_success());
   ASSERT_EQ("iamefpfkojoapidjnbafmgkgncegbkad", listener.id());
 }
 
+// Tests that an error is properly reported when a 204 is returned
+// while trying to download a the crx
+IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, Test204) {
+  scoped_refptr<EmptyCRXInterceptor> interceptor(new EmptyCRXInterceptor());
+  net::URLFetcher::SetEnableInterceptionForTests(true);
+  ASSERT_TRUE(RunInstallTest("error204.html", "extension.crx"));
+}
+
 // Tests successfully installing a bundle of 2 apps and 2 extensions.
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateBundleTest, InstallBundle) {
   extensions::BundleInstaller::SetAutoApproveForTesting(true);
 
   PackCRX("bmfoocgfinpmkmlbjhcbofejhkhlbchk", "extension1.json");
   PackCRX("pkapffpjmiilhlhbibjhamlmdhfneidj", "extension2.json");
   PackCRX("begfmnajjkbjdgmffnjaojchoncnmngg", "app1.json");
   PackCRX("mpneghmdnmaolkljkipbhaienajcflfe", "app2.json");
 
   ASSERT_TRUE(RunPageTest(GetTestServerURL("install_bundle.html").spec()));
@@ skipping 73 matching lines @@
   blacklist->UpdateGpuDataManager();
   GpuFeatureType type =
       content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
 
   bool webgl_allowed = false;
   RunTest(webgl_allowed);
 }
 
 }  // namespace extensions