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

Side by Side Diff: components/translate/core/browser/translate_download_manager.cc

Issue 2839433002: [translate] Fix shutdown race for translate ranker model loader. (Closed)
Patch Set: fdoray part deux Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/translate/core/browser/translate_download_manager.h" 5 #include "components/translate/core/browser/translate_download_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "components/prefs/pref_service.h" 9 #include "components/prefs/pref_service.h"
10 #include "components/translate/core/browser/translate_pref_names.h" 10 #include "components/translate/core/browser/translate_pref_names.h"
11 #include "components/translate/core/common/translate_switches.h" 11 #include "components/translate/core/common/translate_switches.h"
12 12
13 namespace translate { 13 namespace translate {
14 14
15 // static 15 // static
16 TranslateDownloadManager* TranslateDownloadManager::GetInstance() { 16 TranslateDownloadManager* TranslateDownloadManager::GetInstance() {
17 return base::Singleton<TranslateDownloadManager>::get(); 17 return base::Singleton<TranslateDownloadManager>::get();
18 } 18 }
19 19
20 TranslateDownloadManager::TranslateDownloadManager() 20 TranslateDownloadManager::TranslateDownloadManager()
21 : language_list_(new TranslateLanguageList), 21 : language_list_(new TranslateLanguageList),
22 script_(new TranslateScript) {} 22 script_(new TranslateScript) {}
23 23
24 TranslateDownloadManager::~TranslateDownloadManager() {} 24 TranslateDownloadManager::~TranslateDownloadManager() {}
25 25
26 void TranslateDownloadManager::Shutdown() { 26 void TranslateDownloadManager::Shutdown() {
27 DCHECK(sequence_checker_.CalledOnValidSequence());
27 language_list_.reset(); 28 language_list_.reset();
28 script_.reset(); 29 script_.reset();
29 request_context_ = NULL; 30 request_context_ = NULL;
30 } 31 }
31 32
32 // static 33 // static
33 void TranslateDownloadManager::RequestLanguageList(PrefService* prefs) { 34 void TranslateDownloadManager::RequestLanguageList(PrefService* prefs) {
34 // We don't want to do this when translate is disabled. 35 // We don't want to do this when translate is disabled.
35 DCHECK(prefs != NULL); 36 DCHECK(prefs != NULL);
36 if (!prefs->GetBoolean(prefs::kEnableTranslate)) 37 if (!prefs->GetBoolean(prefs::kEnableTranslate))
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 93
93 void TranslateDownloadManager::ClearTranslateScriptForTesting() { 94 void TranslateDownloadManager::ClearTranslateScriptForTesting() {
94 if (script_.get() == NULL) { 95 if (script_.get() == NULL) {
95 NOTREACHED(); 96 NOTREACHED();
96 return; 97 return;
97 } 98 }
98 script_->Clear(); 99 script_->Clear();
99 } 100 }
100 101
101 void TranslateDownloadManager::ResetForTesting() { 102 void TranslateDownloadManager::ResetForTesting() {
103 DCHECK(sequence_checker_.CalledOnValidSequence());
102 language_list_.reset(new TranslateLanguageList); 104 language_list_.reset(new TranslateLanguageList);
103 script_.reset(new TranslateScript); 105 script_.reset(new TranslateScript);
104 } 106 }
105 107
106 void TranslateDownloadManager::SetTranslateScriptExpirationDelay(int delay_ms) { 108 void TranslateDownloadManager::SetTranslateScriptExpirationDelay(int delay_ms) {
109 DCHECK(sequence_checker_.CalledOnValidSequence());
107 if (script_.get() == NULL) { 110 if (script_.get() == NULL) {
108 NOTREACHED(); 111 NOTREACHED();
109 return; 112 return;
110 } 113 }
111 script_->set_expiration_delay(delay_ms); 114 script_->set_expiration_delay(delay_ms);
112 } 115 }
113 116
114 } // namespace translate 117 } // namespace translate
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698