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

Side by Side Diff: chrome/test/mini_installer_test/test.cc

Issue 110163004: Remove Chrome Frame ready-mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile fixes for mini_installer_test Created 7 years 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 | Annotate | Revision Log
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/process/kill.h" 8 #include "base/process/kill.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chrome/common/chrome_result_codes.h" 10 #include "chrome/common/chrome_result_codes.h"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 TEST_F(MiniInstallTest, InstallChromeAndChromeFrameMultiInstallSys) { 323 TEST_F(MiniInstallTest, InstallChromeAndChromeFrameMultiInstallSys) {
324 ASSERT_TRUE(installer_test::Install( 324 ASSERT_TRUE(installer_test::Install(
325 full_installer_, SwitchBuilder().AddChrome() 325 full_installer_, SwitchBuilder().AddChrome()
326 .AddChromeFrame().AddMultiInstall().AddSystemInstall())); 326 .AddChromeFrame().AddMultiInstall().AddSystemInstall()));
327 ASSERT_TRUE(installer_test::ValidateInstall( 327 ASSERT_TRUE(installer_test::ValidateInstall(
328 true, 328 true,
329 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI, 329 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI,
330 provider_->GetCurrentBuild())); 330 provider_->GetCurrentBuild()));
331 } 331 }
332 332
333 TEST_F(MiniInstallTest,
334 InstallChromeAndChromeFrameReadyModeUser) {
335 ASSERT_TRUE(
336 installer_test::Install(full_installer_,SwitchBuilder().AddChrome()
337 .AddChromeFrame().AddMultiInstall().AddReadyMode()));
338 ASSERT_TRUE(installer_test::ValidateInstall(
339 false,
340 InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI,
341 provider_->GetCurrentBuild()));
342 }
343
344 TEST_F(MiniInstallTest,
345 InstallChromeAndChromeFrameReadyModeSys) {
346 ASSERT_TRUE(installer_test::Install(full_installer_,
347 SwitchBuilder().AddChrome().AddChromeFrame().AddMultiInstall()
348 .AddReadyMode().AddSystemInstall()));
349 ASSERT_TRUE(installer_test::ValidateInstall(
350 true,
351 InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI,
352 provider_->GetCurrentBuild()));
353 }
354
355 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallUser) { 333 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallUser) {
356 ASSERT_TRUE(installer_test::Install(full_installer_, 334 ASSERT_TRUE(installer_test::Install(full_installer_,
357 SwitchBuilder().AddChromeFrame().AddMultiInstall())); 335 SwitchBuilder().AddChromeFrame().AddMultiInstall()));
358 ASSERT_TRUE(installer_test::ValidateInstall( 336 ASSERT_TRUE(installer_test::ValidateInstall(
359 false, 337 false,
360 InstallationValidator::CHROME_FRAME_MULTI, 338 InstallationValidator::CHROME_FRAME_MULTI,
361 provider_->GetCurrentBuild())); 339 provider_->GetCurrentBuild()));
362 } 340 }
363 341
364 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallSys) { 342 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallSys) {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 } 403 }
426 404
427 #endif 405 #endif
428 406
429 TEST(GenericInstallTest, MiniInstallTestValidWindowsVersion) { 407 TEST(GenericInstallTest, MiniInstallTestValidWindowsVersion) {
430 // We run the tests on all supported OSes. 408 // We run the tests on all supported OSes.
431 // Make sure the code agrees. 409 // Make sure the code agrees.
432 EXPECT_TRUE(InstallUtil::IsOSSupported()); 410 EXPECT_TRUE(InstallUtil::IsOSSupported());
433 } 411 }
434 412
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698