GTTF: Clean up DownloadFileManager

chrome/browser/profile.cc

 // Copyright (c) 2010 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/profile.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 496 matching lines @@
   }
 
 #if defined(OS_CHROMEOS)
   virtual chromeos::ProxyConfigServiceImpl*
       GetChromeOSProxyConfigServiceImpl() {
     return profile_->GetChromeOSProxyConfigServiceImpl();
   }
 #endif  // defined(OS_CHROMEOS)
 
   virtual void ExitedOffTheRecordMode() {
-    // Drop our download manager so we forget about all the downloads made
-    // in off-the-record mode.
-    download_manager_ = NULL;
+    // DownloadManager is lazily created, so check before accessing it.
+    if (download_manager_.get()) {
+      // Drop our download manager so we forget about all the downloads made
+      // in off-the-record mode.
+      download_manager_->Shutdown();
+      download_manager_ = NULL;
+    }
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     DCHECK_EQ(NotificationType::BROWSER_CLOSED, type.value);
     // We are only interested in OTR browser closing.
     if (Source<Browser>(source)->profile() != this)
       return;
 
@@ skipping 76 matching lines @@
 
   // The file_system context for this profile.
   scoped_refptr<FileSystemHostContext> file_system_host_context_;
 
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };
 
 Profile *Profile::CreateOffTheRecordProfile() {
   return new OffTheRecordProfileImpl(this);
 }