| Index: chrome/browser/search_engines/search_terms_data.cc
|
| diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc
|
| index 32b610081d1dbc839f9a0c7ee055cd28272a33ee..29d10f65b2680f16d9c5b466cb0df8a1d5fb7dcc 100644
|
| --- a/chrome/browser/search_engines/search_terms_data.cc
|
| +++ b/chrome/browser/search_engines/search_terms_data.cc
|
| @@ -90,12 +90,12 @@ std::string* UIThreadSearchTermsData::google_base_url_ = NULL;
|
|
|
| UIThreadSearchTermsData::UIThreadSearchTermsData(Profile* profile)
|
| : profile_(profile) {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| }
|
|
|
| std::string UIThreadSearchTermsData::GoogleBaseURLValue() const {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| if (google_base_url_)
|
| return *google_base_url_;
|
| @@ -108,7 +108,7 @@ std::string UIThreadSearchTermsData::GoogleBaseURLValue() const {
|
| }
|
|
|
| std::string UIThreadSearchTermsData::GetApplicationLocale() const {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| return g_browser_process->GetApplicationLocale();
|
| }
|
| @@ -116,7 +116,7 @@ std::string UIThreadSearchTermsData::GetApplicationLocale() const {
|
| // Android implementations are located in search_terms_data_android.cc.
|
| #if !defined(OS_ANDROID)
|
| string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| string16 rlz_string;
|
| #if defined(ENABLE_RLZ)
|
| @@ -138,26 +138,26 @@ string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
|
| // search client string. There is already a unit test in place for Android
|
| // called TemplateURLTest::SearchClient.
|
| std::string UIThreadSearchTermsData::GetSearchClient() const {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| return std::string();
|
| }
|
| #endif
|
|
|
| std::string UIThreadSearchTermsData::GetSuggestClient() const {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| return chrome::IsInstantExtendedAPIEnabled() ? "chrome-omni" : "chrome";
|
| }
|
|
|
| std::string UIThreadSearchTermsData::InstantEnabledParam() const {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| return chrome::IsInstantExtendedAPIEnabled() ? std::string() : "ion=1&";
|
| }
|
|
|
| std::string UIThreadSearchTermsData::InstantExtendedEnabledParam() const {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| uint64 instant_extended_api_version = chrome::EmbeddedSearchPageVersion();
|
| if (instant_extended_api_version) {
|
| @@ -168,7 +168,7 @@ std::string UIThreadSearchTermsData::InstantExtendedEnabledParam() const {
|
| }
|
|
|
| std::string UIThreadSearchTermsData::NTPIsThemedParam() const {
|
| - DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| #if defined(ENABLE_THEMES)
|
| if (!chrome::IsInstantExtendedAPIEnabled())
|
|
|