Use jstemplates in merge and sync setup page.

chrome/browser/views/sync/sync_setup_wizard.cc

 // Copyright (c) 2006-2008 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.
 
 #ifdef CHROME_PERSONALIZATION
 
 #include "chrome/browser/views/sync/sync_setup_wizard.h"
 
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
@@ skipping 36 matching lines @@
     SendResponse(request_id, html_bytes);
     return;
   }
 
   std::string response;
   if (path_raw == chrome::kSyncGaiaLoginPath) {
     DictionaryValue localized_strings;
     localized_strings.SetString(L"settingupsync",
                                 "Setting up Bookmarks Sync");
     localized_strings.SetString(L"errorsigningin", "Error signing in");
-    localized_strings.SetString(L"introduction", 
+    localized_strings.SetString(L"introduction",
         "Google Chrome can store your bookmark data with your Google account."
         "Bookmarks that you create on this computer will instantly be made"
         "available on all the computers synced to this account.");
     localized_strings.SetString(L"signinwithyour", "Sign in with your");
     localized_strings.SetString(L"accountlabel", "Account");
     localized_strings.SetString(L"cannotbeblank",
                                 "Required field cannot be left blank");
     localized_strings.SetString(L"passwordlabel", "Password:");
     localized_strings.SetString(L"emaillabel", "Email:");
     localized_strings.SetString(L"invalidcredentials",
                                 "Username and password do not match.");
     localized_strings.SetString(L"couldnotconnect",
                                 "Could not connect to the server");
     localized_strings.SetString(L"cannotaccessaccount",
                                 "I cannot access my account");
     localized_strings.SetString(L"createaccount",
                                 "Create a Google Account");
-    
+
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_GAIA_LOGIN_HTML));
 
     response = jstemplate_builder::GetI18nTemplateHtml(
         html, &localized_strings);
   } else if (path_raw == chrome::kSyncMergeAndSyncPath) {
+    DictionaryValue localized_strings;
+    localized_strings.SetString(L"mergeandsyncwarning",
+        "Your existing online bookmarks will be merged with the "
+        "bookmarks on this machine. You can use the Bookmark Manager to "
+        "organize your bookmarks after the merge.");
+    localized_strings.SetString(L"titlewarning",
+                                "Your bookmarks will be merged.");
+    localized_strings.SetString(L"mergeandsynclabel", "Merge and sync");
+    localized_strings.SetString(L"abortlabel", "Abort");
+    localized_strings.SetString(L"alldone", "All Done!");
+    localized_strings.SetString(L"closelabel", "Close");
+
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_MERGE_AND_SYNC_HTML));
-    response = html.as_string();
+
+    response = jstemplate_builder::GetI18nTemplateHtml(
+        html, &localized_strings);
   } else if (path_raw == chrome::kSyncSetupFlowPath) {
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_SYNC_SETUP_FLOW_HTML));
     response = html.as_string();
   }
   // Send the response.
   html_bytes->data.resize(response.size());
   std::copy(response.begin(), response.end(), html_bytes->data.begin());
   SendResponse(request_id, html_bytes);
 }
@@ skipping 45 matching lines @@
 // static
 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun(
     State start_state) {
   State result = start_state == GAIA_LOGIN ? GAIA_SUCCESS : DONE;
   DCHECK_NE(DONE, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }
 
 #endif  // CHROME_PERSONALIZATION