Merge 254314 "Fix race condition in uploading feedback reports."

chrome/browser/feedback/feedback_profile_observer.cc

 // Copyright 2014 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/feedback/feedback_profile_observer.h"
 
 #include "base/callback.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/feedback/feedback_report.h"
 #include "chrome/browser/feedback/feedback_uploader.h"
@@ skipping 25 matching lines @@
 }
 
 void FeedbackProfileObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CREATED, type);
 
   Profile* profile = content::Source<Profile>(source).ptr();
-  if (!profile->IsOffTheRecord())
+  if (profile && !profile->IsOffTheRecord())
     QueueUnsentReports(profile);
 }
 
 void FeedbackProfileObserver::QueueUnsentReports(
     content::BrowserContext* context) {
   feedback::FeedbackUploader* uploader =
       feedback::FeedbackUploaderFactory::GetForBrowserContext(context);
   BrowserThread::PostBlockingPoolTask(FROM_HERE,
-      base::Bind(
-          &FeedbackReport::LoadReportsAndQueue, context, base::Bind(
-              &FeedbackUploader::QueueReport, uploader->AsWeakPtr())));
+      base::Bind(&FeedbackReport::LoadReportsAndQueue,
+                 context->GetPath(),
+                 base::Bind(&FeedbackUploader::QueueReport,
+                            uploader->AsWeakPtr())));
 }
 
 }  // namespace feedback