Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: chrome/installer/setup/install_unittest.cc

Issue 1581473002: Remove base/win/metro.{cc|h} and some associated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <objbase.h> 5 #include <objbase.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 ShellUtil::ShortcutProperties chrome_properties(ShellUtil::CURRENT_USER); 83 ShellUtil::ShortcutProperties chrome_properties(ShellUtil::CURRENT_USER);
84 product_->AddDefaultShortcutProperties(chrome_exe_, &chrome_properties); 84 product_->AddDefaultShortcutProperties(chrome_exe_, &chrome_properties);
85 85
86 expected_properties_.set_target(chrome_exe_); 86 expected_properties_.set_target(chrome_exe_);
87 expected_properties_.set_icon(chrome_properties.icon, 87 expected_properties_.set_icon(chrome_properties.icon,
88 chrome_properties.icon_index); 88 chrome_properties.icon_index);
89 expected_properties_.set_app_id(chrome_properties.app_id); 89 expected_properties_.set_app_id(chrome_properties.app_id);
90 expected_properties_.set_description(chrome_properties.description); 90 expected_properties_.set_description(chrome_properties.description);
91 expected_properties_.set_dual_mode(false); 91 expected_properties_.set_dual_mode(false);
92 expected_start_menu_properties_ = expected_properties_; 92 expected_start_menu_properties_ = expected_properties_;
93 expected_start_menu_properties_.set_dual_mode( 93 expected_start_menu_properties_.set_dual_mode(false);
94 InstallUtil::ShouldInstallMetroProperties());
95 94
96 prefs_.reset(GetFakeMasterPrefs(false, false)); 95 prefs_.reset(GetFakeMasterPrefs(false, false));
97 96
98 ASSERT_TRUE(fake_user_desktop_.CreateUniqueTempDir()); 97 ASSERT_TRUE(fake_user_desktop_.CreateUniqueTempDir());
99 ASSERT_TRUE(fake_common_desktop_.CreateUniqueTempDir()); 98 ASSERT_TRUE(fake_common_desktop_.CreateUniqueTempDir());
100 ASSERT_TRUE(fake_user_quick_launch_.CreateUniqueTempDir()); 99 ASSERT_TRUE(fake_user_quick_launch_.CreateUniqueTempDir());
101 ASSERT_TRUE(fake_start_menu_.CreateUniqueTempDir()); 100 ASSERT_TRUE(fake_start_menu_.CreateUniqueTempDir());
102 ASSERT_TRUE(fake_common_start_menu_.CreateUniqueTempDir()); 101 ASSERT_TRUE(fake_common_start_menu_.CreateUniqueTempDir());
103 user_desktop_override_.reset( 102 user_desktop_override_.reset(
104 new base::ScopedPathOverride(base::DIR_USER_DESKTOP, 103 new base::ScopedPathOverride(base::DIR_USER_DESKTOP,
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 installer::EscapeXmlAttributeValueInSingleQuotes(&val); 466 installer::EscapeXmlAttributeValueInSingleQuotes(&val);
468 ASSERT_STREQ(kExpectedEscapedVal, val.c_str()); 467 ASSERT_STREQ(kExpectedEscapedVal, val.c_str());
469 } 468 }
470 469
471 TEST(EscapeXmlAttributeValueTest, DontEscapeNormalValue) { 470 TEST(EscapeXmlAttributeValueTest, DontEscapeNormalValue) {
472 base::string16 val(L"Google Chrome"); 471 base::string16 val(L"Google Chrome");
473 static const wchar_t kExpectedEscapedVal[] = L"Google Chrome"; 472 static const wchar_t kExpectedEscapedVal[] = L"Google Chrome";
474 installer::EscapeXmlAttributeValueInSingleQuotes(&val); 473 installer::EscapeXmlAttributeValueInSingleQuotes(&val);
475 ASSERT_STREQ(kExpectedEscapedVal, val.c_str()); 474 ASSERT_STREQ(kExpectedEscapedVal, val.c_str());
476 } 475 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698