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

Side by Side Diff: chrome/browser/profile.cc

Issue 391062: Move NULLing of OCSP context from UI thread to IO thread, to avoid possible r... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 11 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/net/chrome_url_request_context.cc ('k') | net/ocsp/nss_ocsp.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profile.h" 5 #include "chrome/browser/profile.h"
6 6
7 #include "app/theme_provider.h" 7 #include "app/theme_provider.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/common/chrome_switches.h" 51 #include "chrome/common/chrome_switches.h"
52 #include "chrome/common/extensions/extension_error_reporter.h" 52 #include "chrome/common/extensions/extension_error_reporter.h"
53 #include "chrome/common/notification_service.h" 53 #include "chrome/common/notification_service.h"
54 #include "chrome/common/pref_names.h" 54 #include "chrome/common/pref_names.h"
55 #include "chrome/common/render_messages.h" 55 #include "chrome/common/render_messages.h"
56 #include "grit/locale_settings.h" 56 #include "grit/locale_settings.h"
57 #include "net/base/strict_transport_security_state.h" 57 #include "net/base/strict_transport_security_state.h"
58 #include "webkit/database/database_tracker.h" 58 #include "webkit/database/database_tracker.h"
59 59
60 #if defined(OS_LINUX) 60 #if defined(OS_LINUX)
61 #include "net/ocsp/nss_ocsp.h"
62 #include "chrome/browser/gtk/gtk_theme_provider.h" 61 #include "chrome/browser/gtk/gtk_theme_provider.h"
63 #endif 62 #endif
64 63
65 #if defined(OS_CHROMEOS) 64 #if defined(OS_CHROMEOS)
66 #include "chrome/browser/chromeos/preferences.h" 65 #include "chrome/browser/chromeos/preferences.h"
67 #endif 66 #endif
68 67
69 using base::Time; 68 using base::Time;
70 using base::TimeDelta; 69 using base::TimeDelta;
71 70
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 768
770 if (history_service_.get()) 769 if (history_service_.get())
771 history_service_->Cleanup(); 770 history_service_->Cleanup();
772 771
773 #if defined(SPELLCHECKER_IN_RENDERER) 772 #if defined(SPELLCHECKER_IN_RENDERER)
774 if (spellcheck_host_.get()) 773 if (spellcheck_host_.get())
775 spellcheck_host_->UnsetObserver(); 774 spellcheck_host_->UnsetObserver();
776 #endif 775 #endif
777 DeleteSpellCheckerImpl(false); 776 DeleteSpellCheckerImpl(false);
778 777
779 if (default_request_context_ == request_context_) { 778 if (default_request_context_ == request_context_)
780 #if defined(OS_LINUX)
781 // We use default_request_context_ for OCSP.
782 // Release URLRequestContext used in OCSP handlers.
783 net::SetURLRequestContextForOCSP(NULL);
784 #endif
785 default_request_context_ = NULL; 779 default_request_context_ = NULL;
786 }
787 780
788 CleanupRequestContext(request_context_); 781 CleanupRequestContext(request_context_);
789 CleanupRequestContext(media_request_context_); 782 CleanupRequestContext(media_request_context_);
790 CleanupRequestContext(extensions_request_context_); 783 CleanupRequestContext(extensions_request_context_);
791 784
792 // When the request contexts are gone, the blacklist wont be needed anymore. 785 // When the request contexts are gone, the blacklist wont be needed anymore.
793 blacklist_.reset(); 786 blacklist_.reset();
794 787
795 // HistoryService may call into the BookmarkModel, as such we need to 788 // HistoryService may call into the BookmarkModel, as such we need to
796 // delete HistoryService before the BookmarkModel. The destructor for 789 // delete HistoryService before the BookmarkModel. The destructor for
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 } 1439 }
1447 if (!sync_service_.get()) 1440 if (!sync_service_.get())
1448 InitSyncService(); 1441 InitSyncService();
1449 return sync_service_.get(); 1442 return sync_service_.get();
1450 } 1443 }
1451 1444
1452 void ProfileImpl::InitSyncService() { 1445 void ProfileImpl::InitSyncService() {
1453 sync_service_.reset(new ProfileSyncService(this)); 1446 sync_service_.reset(new ProfileSyncService(this));
1454 sync_service_->Initialize(); 1447 sync_service_->Initialize();
1455 } 1448 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_url_request_context.cc ('k') | net/ocsp/nss_ocsp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698