Manually merging remaining Win8 changes.

win8/metro_driver/secondary_tile.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.
 
 #include "stdafx.h"
 #include "secondary_tile.h"
 
 #include <windows.ui.startscreen.h>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "crypto/sha2.h"
+#include "googleurl/src/gurl.h"
 #include "win8/metro_driver/chrome_app_view.h"
 #include "win8/metro_driver/winrt_utils.h"
 
 namespace {
 
 string16 GenerateTileId(const string16& url_str) {
   uint8 hash[crypto::kSHA256Length];
   crypto::SHA256HashString(UTF16ToUTF8(url_str), hash, sizeof(hash));
   std::string hash_str = base::HexEncode(hash, sizeof(hash));
   return UTF8ToUTF16(hash_str);
@@ skipping 56 matching lines @@
       tile_factory.GetAddressOf());
   CheckHR(hr, "Failed to create instance of ISecondaryTileFactory");
 
   winui::StartScreen::TileOptions options =
       winui::StartScreen::TileOptions_ShowNameOnLogo;
   mswrw::HString title;
   title.Attach(MakeHString(title_str));
   mswrw::HString id;
   id.Attach(MakeHString(GenerateTileId(url_str)));
   mswrw::HString args;
-  args.Attach(MakeHString(string16(L"url=").append(url_str)));
+  // The url is just passed into the tile agruments as is. Metro and desktop
+  // chrome will see the arguments as command line parameters.
+  // A GURL is used to ensure any spaces are properly escaped.
+  GURL url(url_str);
+  args.Attach(MakeHString(UTF8ToUTF16(url.spec())));
 
   mswr::ComPtr<winfoundtn::IUriRuntimeClassFactory> uri_factory;
   hr = winrt_utils::CreateActivationFactory(
       RuntimeClass_Windows_Foundation_Uri,
       uri_factory.GetAddressOf());
   CheckHR(hr, "Failed to create URIFactory");
 
   mswrw::HString logo_url;
   logo_url.Attach(MakeHString(GetLogoUrlString()));
   mswr::ComPtr<winfoundtn::IUriRuntimeClass> uri;
@@ skipping 41 matching lines @@
   VLOG(1) << __FUNCTION__ << " url: " << url;
   return IsPinnedToStartScreen(url);
 }
 
 void MetroTogglePinnedToStartScreen(const string16& title,
                                     const string16& url) {
   DVLOG(1) << __FUNCTION__ << " title:" << title << " url: " << url;
   globals.appview_msg_loop->PostTask(
       FROM_HERE, base::Bind(&TogglePinnedToStartScreen, title, url));
 }