Merge 25834 - Ensure that tips change when the Chrome language changes....

chrome/browser/web_resource/web_resource_service.cc

Index: chrome/browser/web_resource/web_resource_service.cc
===================================================================
--- chrome/browser/web_resource/web_resource_service.cc	(revision 25834)
+++ chrome/browser/web_resource/web_resource_service.cc	(working copy)
@@ -196,15 +196,20 @@
   resource_dispatcher_host_ = g_browser_process->resource_dispatcher_host();
   web_resource_fetcher_ = new WebResourceFetcher(this);
   prefs_->RegisterStringPref(prefs::kNTPTipsCacheUpdate, L"0");
+  std::wstring locale = ASCIIToWide(g_browser_process->GetApplicationLocale());
 
-  // TODO(mirandac): allow for language change without wiping out prefs file.
   if (prefs_->HasPrefPath(prefs::kNTPTipsServer)) {
-    web_resource_server_ = prefs_->GetString(prefs::kNTPTipsServer);
-  } else {
-    web_resource_server_ = kDefaultResourceServer;
-    web_resource_server_.append(
-      ASCIIToWide(g_browser_process->GetApplicationLocale()));
+     web_resource_server_ = prefs_->GetString(prefs::kNTPTipsServer);
+     // If we are in the correct locale, initialization is done.
+     if (EndsWith(web_resource_server_, locale, false))
+       return;
   }
+
+  // If we have not yet set a server, or if the tips server is set to the wrong
+  // locale, reset the server and force an immediate update of tips.
+  web_resource_server_ = kDefaultResourceServer;
+  web_resource_server_.append(locale);
+  prefs_->SetString(prefs::kNTPTipsCacheUpdate, L"");
 }
 
 void WebResourceService::EndFetch() {
@@ -258,13 +263,15 @@
   if (prefs_->HasPrefPath(prefs::kNTPTipsCacheUpdate)) {
     std::wstring last_update_pref =
       prefs_->GetString(prefs::kNTPTipsCacheUpdate);
-    int ms_until_update = kCacheUpdateDelay -
-        static_cast<int>((base::Time::Now() - base::Time::FromDoubleT(
-        StringToDouble(WideToASCII(last_update_pref)))).InMilliseconds());
+    if (!last_update_pref.empty()) {
+      int ms_until_update = kCacheUpdateDelay -
+          static_cast<int>((base::Time::Now() - base::Time::FromDoubleT(
+          StringToDouble(WideToASCII(last_update_pref)))).InMilliseconds());
 
-    delay = ms_until_update > kCacheUpdateDelay ?
-            kCacheUpdateDelay : (ms_until_update < kStartResourceFetchDelay ?
-                                 kStartResourceFetchDelay : ms_until_update);
+      delay = ms_until_update > kCacheUpdateDelay ?
+              kCacheUpdateDelay : (ms_until_update < kStartResourceFetchDelay ?
+                                   kStartResourceFetchDelay : ms_until_update);
+    }
   }
 
   // Start fetch and wait for UpdateResourceCache.
Property changes on: chrome\browser\web_resource\web_resource_service.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/web_resource/web_resource_service.cc:r25834