[Autofill] Loosen thread-safety DCHECK in AutofillCountry so that tests will pass when run in isola…

chrome/browser/autofill/autofill_country.cc

 // Copyright (c) 2012 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/autofill/autofill_country.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <map>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
+#include "base/threading/thread_checker.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "grit/generated_resources.h"
 #include "third_party/icu/public/common/unicode/locid.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "third_party/icu/public/common/unicode/unistr.h"
 #include "third_party/icu/public/common/unicode/urename.h"
 #include "third_party/icu/public/common/unicode/utypes.h"
 #include "third_party/icu/public/i18n/unicode/coll.h"
@@ skipping 601 matching lines @@
 
   // Returns the ICU sort key corresponding to |str| for the given |collator|.
   // Uses |buffer| as temporary storage, and might resize |buffer| as a side-
   // effect. |buffer_size| should specify the |buffer|'s size, and is updated if
   // the |buffer| is resized.
   const std::string GetSortKey(const icu::Collator& collator,
                                const string16& str,
                                scoped_array<uint8_t>* buffer,
                                int32_t* buffer_size) const;
 
-
   // Maps from common country names, including 2- and 3-letter country codes,
   // to the corresponding 2-letter country codes. The keys are uppercase ASCII
   // strings.
   std::map<std::string, std::string> common_names_;
 
   // The outer map keys are ICU locale identifiers.
   // The inner maps map from localized country names to their corresponding
   // country codes. The inner map keys are ICU collation sort keys corresponding
   // to the target localized country name.
   std::map<std::string, std::map<std::string, std::string> >
       locales_to_localized_names_;
 
   // Maps ICU locale names to their corresponding collators.
   std::map<std::string, icu::Collator*> collators_;
 
+  // Verifies thread-safety of accesses to the application locale.
+  base::ThreadChecker thread_checker_;
+
   // Caches the application locale, for thread-safe access.
   std::string application_locale_;
 
   DISALLOW_COPY_AND_ASSIGN(CountryNames);
 };
 
 // static
 CountryNames* CountryNames::GetInstance() {
   return Singleton<CountryNames>::get();
 }
 
 const std::string CountryNames::ApplicationLocale() {
   if (application_locale_.empty()) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    // In production code, this class is always constructed on the UI thread, so
+    // the two conditions in the below DCHECK are identical.  In test code,
+    // sometimes there is a UI thread, and sometimes there is just the unnamed
+    // main thread.  Since this class is a singleton, it needs to support both
+    // cases.  Hence, the somewhat strange looking DCHECK below.
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+           thread_checker_.CalledOnValidThread());
     application_locale_ =
         content::GetContentClient()->browser()->GetApplicationLocale();
   }
 
   return application_locale_;
 }
 
 CountryNames::CountryNames() {
   // Add 2- and 3-letter ISO country codes.
   for (CountryDataMap::Iterator it = CountryDataMap::Begin();
@@ skipping 200 matching lines @@
 
 AutofillCountry::AutofillCountry(const std::string& country_code,
                                  const string16& name,
                                  const string16& postal_code_label,
                                  const string16& state_label)
     : country_code_(country_code),
       name_(name),
       postal_code_label_(postal_code_label),
       state_label_(state_label) {
 }