Guard against more NULL pointers in WebstoreInstaller.

chrome/browser/extensions/webstore_installer.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 "chrome/browser/extensions/webstore_installer.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 17 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_save_info.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadId;
@@ skipping 126 matching lines @@
                                      Delegate* delegate,
                                      NavigationController* controller,
                                      const std::string& id,
                                      scoped_ptr<Approval> approval,
                                      int flags)
     : profile_(profile),
       delegate_(delegate),
       controller_(controller),
       id_(id),
       download_item_(NULL),
-      flags_(flags),
       approval_(approval.release()) {
-  // TODO(benjhayden): Change this CHECK to DCHECK after http://crbug.com/126013
-  CHECK(controller_);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(controller_);
   download_url_ = GetWebstoreInstallURL(id, flags & FLAG_INLINE_INSTALL ?
       kInlineInstallSource : kDefaultInstallSource);
 
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   registrar_.Add(this, chrome::NOTIFICATION_CRX_INSTALLER_DONE,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
                  content::Source<Profile>(profile->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                  content::Source<CrxInstaller>(NULL));
 }
 
 void WebstoreInstaller::Start() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 71 matching lines @@
 void WebstoreInstaller::OnDownloadStarted(DownloadId id, net::Error error) {
   if (error != net::OK) {
     ReportFailure(net::ErrorToString(error));
     return;
   }
 
   CHECK(id.IsValid());
 
   DownloadManager* download_manager =
       BrowserContext::GetDownloadManager(profile_);
-  download_item_ = download_manager->GetActiveDownloadItem(id.local());
-  download_item_->AddObserver(this);
-  if (approval_.get())
-    download_item_->SetUserData(kApprovalKey, approval_.release());
+  if (!download_manager)
+    return;
+  download_item_ = download_manager->GetDownload(id.local());
+  if (download_item_) {
+    download_item_->AddObserver(this);
+    if (approval_.get())
+      download_item_->SetUserData(kApprovalKey, approval_.release());
+  }
 }
 
 void WebstoreInstaller::OnDownloadUpdated(DownloadItem* download) {
   CHECK_EQ(download_item_, download);
 
   switch (download->GetState()) {
     case DownloadItem::CANCELLED:
       ReportFailure(kDownloadCanceledError);
       break;
     case DownloadItem::INTERRUPTED:
@@ skipping 12 matching lines @@
 
 void WebstoreInstaller::OnDownloadDestroyed(DownloadItem* download) {
   CHECK_EQ(download_item_, download);
   download_item_->RemoveObserver(this);
   download_item_ = NULL;
 }
 
 void WebstoreInstaller::StartDownload(const FilePath& file) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (file.empty() || !controller_->GetWebContents()) {
+  DownloadManager* download_manager =
+    BrowserContext::GetDownloadManager(profile_);
+  if (file.empty() ||
+      !download_manager ||
+      !controller_->GetWebContents() ||
+      !controller_->GetWebContents()->GetRenderProcessHost() ||
+      !controller_->GetWebContents()->GetRenderViewHost() ||
+      !controller_->GetWebContents()->GetBrowserContext() ||
+      !controller_->GetWebContents()->GetBrowserContext()
+        ->GetResourceContext()) {
     ReportFailure(kDownloadDirectoryError);
     return;
   }
 
   content::DownloadSaveInfo save_info;
   save_info.file_path = file;
 
   // The download url for the given extension is contained in |download_url_|.
   // We will navigate the current tab to this url to start the download. The
   // download system will then pass the crx to the CrxInstaller.
   download_util::RecordDownloadSource(
       download_util::INITIATED_BY_WEBSTORE_INSTALLER);
   scoped_ptr<DownloadUrlParameters> params(
       DownloadUrlParameters::FromWebContents(
           controller_->GetWebContents(), download_url_, save_info));
   if (controller_->GetActiveEntry())
     params->set_referrer(
         content::Referrer(controller_->GetActiveEntry()->GetURL(),
                           WebKit::WebReferrerPolicyDefault));
   params->set_callback(base::Bind(&WebstoreInstaller::OnDownloadStarted, this));
-  BrowserContext::GetDownloadManager(profile_)->DownloadUrl(params.Pass());
+  download_manager->DownloadUrl(params.Pass());
 }
 
 void WebstoreInstaller::ReportFailure(const std::string& error) {
   if (delegate_) {
     delegate_->OnExtensionInstallFailure(id_, error);
     delegate_ = NULL;
   }
 
   Release();  // Balanced in Start().
 }
 
 void WebstoreInstaller::ReportSuccess() {
   if (delegate_) {
     delegate_->OnExtensionInstallSuccess(id_);
     delegate_ = NULL;
   }
 
   Release();  // Balanced in Start().
 }
 
 }  // namespace extensions