make utf-8 default encoding for remoting_localize.py

Review URL: https://codereview.chromium.org/140793007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245489 0039d316-1c4b-4281-b951-d872f2087c98

remoting/remoting.gyp

@@ -805,7 +805,6 @@
                 '--template', 'host/plugin/host_plugin-InfoPlist.strings.jinja2',
                 '--locale_output',
                 '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/@{json_suffix}.lproj/InfoPlist.strings',
-                '--encoding', 'utf-8',
                 '<@(remoting_locales)',
               ],
             },
@@ -827,7 +826,6 @@
                 '--template', 'host/remoting_me2me_host-InfoPlist.strings.jinja2',
                 '--locale_output',
                 '<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_suffix}.lproj/InfoPlist.strings',
-                '--encoding', 'utf-8',
                 '<@(remoting_locales)',
               ],
             },
@@ -849,7 +847,6 @@
                 '--template', 'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2',
                 '--locale_output',
                 '<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resources/@{json_suffix}.lproj/InfoPlist.strings',
-                '--encoding', 'utf-8',
                 '<@(remoting_locales)',
               ],
             },
@@ -871,7 +868,6 @@
                 '--template', 'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2',
                 '--locale_output',
                 '<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{json_suffix}.lproj/InfoPlist.strings',
-                '--encoding', 'utf-8',
                 '<@(remoting_locales)',
               ],
             },
@@ -1642,6 +1638,7 @@
                 '--locale_dir', '<(webapp_locale_dir)',
                 '--template', '<(RULE_INPUT_PATH)',
                 '--output', '<@(_outputs)',
+                '--encoding', 'utf-16',
                 '<@(remoting_locales)',
               ],
               'message': 'Localizing the dialogs and strings'
@@ -2265,7 +2262,6 @@
                 '--template', '<(input)',
                 '--locale_output',
                 '<(output)',
-                '--encoding', 'utf-8',
                 'en',
               ],
             },

remoting/tools/build/remoting_localize.py

@@ -590,7 +590,7 @@ def ReadMessagesFromFile(file_name):
   return values
 
 
-def WriteIfChanged(file_name, contents, encoding='utf-16'):
+def WriteIfChanged(file_name, contents, encoding):
   """
   Writes the specified contents to the specified file_name
   iff the contents are different than the current contents.
@@ -743,8 +743,8 @@ def DoMain(argv):
       '-d', '--define', dest='define', action='append', type='string',
       help='define a variable (NAME=VALUE).')
   parser.add_option(
-      '--encoding', dest='encoding', type='string', default='utf-16',
-      help="set the encoding of <output>. 'utf-16' is the default.")
+      '--encoding', dest='encoding', type='string', default='utf-8',
+      help="set the encoding of <output>. 'utf-8' is the default.")
   parser.add_option(
       '--jinja2', dest='jinja2', type='string',
       help="specifies path to the jinja2 library.")