Merge 143290 - Replace all spaces by '_' in the AppUserModelId

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 1112 matching lines @@
       // to avoid losing the unique parts of this component (which are usually
       // at the beginning or end for things like usernames and paths).
       app_id.append(component.c_str(), 0, max_component_length / 2);
       app_id.append(component.c_str(),
                     component.length() - ((max_component_length + 1) / 2),
                     string16::npos);
     } else {
       app_id.append(component);
     }
   }
+  // No spaces are allowed in the AppUserModelId according to MSDN.
+  ReplaceChars(app_id, L" ", L"_", &app_id);
   return app_id;
 }
 
 // static
 bool ShellUtil::CanMakeChromeDefaultUnattended() {
   return base::win::GetVersion() < base::win::VERSION_WIN8;
 }
 
 bool ShellUtil::MakeChromeDefault(BrowserDistribution* dist,
                                   int shell_change,
@@ skipping 368 matching lines @@
       chrome_exe.c_str(),
       shortcut.c_str(),
       chrome_path.value().c_str(),
       arguments.c_str(),
       description.c_str(),
       icon_path.c_str(),
       icon_index,
       app_id.c_str(),
       ConvertShellUtilShortcutOptionsToFileUtil(options));
 }