Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

components/autofill/browser/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 "components/autofill/browser/autofill_country.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <map>
 #include <utility>
 
+#include "base/i18n/rtl.h"
 #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"
 #include "third_party/icu/public/i18n/unicode/ucol.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 636 matching lines @@
 
 const std::string CountryNames::ApplicationLocale() {
   if (application_locale_.empty()) {
     // 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();
+    application_locale_ = base::i18n::GetConfiguredLocale();

[Ilya Sherman, 2013/04/03 23:51:18]

Can you use g_browser_process->GetApplicationLocale() here?

[jam, 2013/04/04 02:45:15]

no, since src\components can't depend on src\chrome.
https://codereview.chromium.org/13488009/ removes these uses, but I can't figure
out how to remove the use in address.cc. either Get/SetRawInfo need to take a
locale, or perhaps the locale should just be stored on these classes instead of
passing it through all these different locations?

[Ilya Sherman, 2013/04/04 04:05:36]

Ah, right, we've been componentized.  *sigh*
We can discuss this more on the other CL, but the short answer is that the TODO
in Address::SetRawInfo() should be fixed, i.e. we shouldn't try to fix up data
being saved via SetRawInfo().  This requires careful changes to the Sync code,
though, which is why it's still a TODO, rather than a TO-DONE.

[jam, 2013/04/04 17:58:35]

are you planning on fixing this soon? I had looked through this and seeing sync
code, didn't feel like touching that code as I'm not familiar with it.

The problem is if we leave AutofillCountry::ApplicationLocale cache behind then
it will be used by other places. we can change the call sites in address.cc to
go to ICU directly, however that has the tradeoff that it'll be the only code
that will call to ICU to get the default language, and that seems like a pattern
that we don't want to spread as well.

   }
 
   return application_locale_;
 }
 
 CountryNames::CountryNames() {
   // Add 2- and 3-letter ISO country codes.
   for (CountryDataMap::Iterator it = CountryDataMap::Begin();
        it != CountryDataMap::End();
        ++it) {
@@ skipping 198 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) {
 }