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

chrome/browser/web_resource/web_resource_service.cc

 // Copyright (c) 2009 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/web_resource/web_resource_service.h"
 
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 178 matching lines @@
     in_fetch_(false) {
   Init();
 }
 
 WebResourceService::~WebResourceService() { }
 
 void WebResourceService::Init() {
   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() {
   in_fetch_ = false;
 }
 
 void WebResourceService::OnWebResourceUnpacked(
   const DictionaryValue& parsed_json) {
   // Get dictionary of cached preferences.
   web_resource_cache_ =
@@ skipping 33 matching lines @@
   EndFetch();
 }
 
 void WebResourceService::StartAfterDelay() {
   int delay = kStartResourceFetchDelay;
   // Check whether we have ever put a value in the web resource cache;
   // if so, pull it out and see if it's time to update again.
   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.
   web_resource_fetcher_->StartAfterDelay(static_cast<int>(delay));
 }
 
 void WebResourceService::UpdateResourceCache(const std::string& json_data) {
   UnpackerClient* client = new UnpackerClient(this, json_data);
   client->Start();
 
   // Update resource server and cache update time in preferences.
   prefs_->SetString(prefs::kNTPTipsCacheUpdate,
       DoubleToWString(base::Time::Now().ToDoubleT()));
   prefs_->SetString(prefs::kNTPTipsServer, web_resource_server_);
 }