Protect predictor_ shutdown in PrifileImplIoData::Handle destructor

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2011 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/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 38 matching lines @@
 
 ProfileImplIOData::Handle::~Handle() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (main_request_context_getter_)
     main_request_context_getter_->CleanupOnUIThread();
   if (media_request_context_getter_)
     media_request_context_getter_->CleanupOnUIThread();
   if (extensions_request_context_getter_)
     extensions_request_context_getter_->CleanupOnUIThread();
 
-  // TODO(rlp): Remove CHECKs once we have determined the cause for flakiness
-  // during predictor shutdown. See http://crosbug.com/20407.
-  CHECK(profile_ != NULL);
-  PrefService* user_prefs = profile_->GetPrefs();
-  CHECK(io_data_->predictor_.get() != NULL);
-  io_data_->predictor_->ShutdownOnUIThread(user_prefs);
+  if (io_data_->predictor_.get() != NULL) {
+    // io_data_->predictor_ might be NULL if Init() was never called
+    // (i.e. we shut down before ProfileImpl::DoFinalInit() got called).
+    PrefService* user_prefs = profile_->GetPrefs();
+    io_data_->predictor_->ShutdownOnUIThread(user_prefs);
+  }
 
   // Clean up all isolated app request contexts.
   for (ChromeURLRequestContextGetterMap::iterator iter =
            app_request_context_getter_map_.begin();
        iter != app_request_context_getter_map_.end();
        ++iter) {
     iter->second->CleanupOnUIThread();
   }
 
   io_data_->ShutdownOnUIThread();
@@ skipping 387 matching lines @@
 scoped_refptr<ChromeURLRequestContext>
 ProfileImplIOData::AcquireIsolatedAppRequestContext(
     scoped_refptr<ChromeURLRequestContext> main_context,
     const std::string& app_id) const {
   // We create per-app contexts on demand, unlike the others above.
   scoped_refptr<ChromeURLRequestContext> app_request_context =
       InitializeAppRequestContext(main_context, app_id);
   DCHECK(app_request_context);
   return app_request_context;
 }