Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: net/base/file_stream_context.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/file_stream_context.h ('k') | net/base/file_stream_context_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/file_stream_context.cc
diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc
index fc2af1baac570f9506bdda9d18af9f1ee3a89633..69741e5af0930352a4dfac70de91193435e43b98 100644
--- a/net/base/file_stream_context.cc
+++ b/net/base/file_stream_context.cc
@@ -77,12 +77,6 @@ void FileStream::Context::Orphan() {
orphaned_ = true;
-#if defined(OS_WIN)
- // Clean up weak pointers here to ensure that they are destroyed on the
- // same thread where they were created.
- weak_ptr_factory_.InvalidateWeakPtrs();
-#endif
-
if (!async_in_progress_) {
CloseAndDelete();
} else if (file_.IsValid()) {
@@ -221,7 +215,10 @@ void FileStream::Context::OnOpenCompleted(const CompletionCallback& callback,
}
void FileStream::Context::CloseAndDelete() {
- DCHECK(!async_in_progress_);
+ // TODO(ananta)
+ // Replace this CHECK with a DCHECK once we figure out the root cause of
+ // http://crbug.com/455066
+ CHECK(!async_in_progress_);
if (file_.IsValid()) {
bool posted = task_runner_.get()->PostTask(
« no previous file with comments | « net/base/file_stream_context.h ('k') | net/base/file_stream_context_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698