diff options
| author | hnguyen@chromium.org <hnguyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-05 21:06:00 +0000 |
|---|---|---|
| committer | hnguyen@chromium.org <hnguyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-05 21:06:00 +0000 |
| commit | e906982dbcbfd66df7ef447ad68ec5615d9c7fbe (patch) | |
| tree | 8835b78a0fc792221221f7e0c6753cc61fb20bd0 /chrome/test/mini_installer_test/run_all_unittests.cc | |
| parent | 1640a858ef20d80bad280c0c91cdff8506583fad (diff) | |
| download | chromium_src-e906982dbcbfd66df7ef447ad68ec5615d9c7fbe.zip chromium_src-e906982dbcbfd66df7ef447ad68ec5615d9c7fbe.tar.gz chromium_src-e906982dbcbfd66df7ef447ad68ec5615d9c7fbe.tar.bz2 | |
Resubmitting 8464001 after removing obsolete tests.
patch from issue 9009001
patch from issue 8464001
BUG=none
TEST=non
Review URL: http://codereview.chromium.org/9006020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/mini_installer_test/run_all_unittests.cc')
| -rw-r--r-- | chrome/test/mini_installer_test/run_all_unittests.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/mini_installer_test/run_all_unittests.cc b/chrome/test/mini_installer_test/run_all_unittests.cc index 978bb3b..68e1a0d 100644 --- a/chrome/test/mini_installer_test/run_all_unittests.cc +++ b/chrome/test/mini_installer_test/run_all_unittests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -10,7 +10,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/util_constants.h" #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" -#include "chrome_mini_installer.h" +#include "chrome/test/mini_installer_test/installer_test_util.h" + void BackUpProfile(bool chrome_frame) { if (base::GetProcessCount(L"chrome.exe", NULL) > 0) { @@ -18,9 +19,8 @@ void BackUpProfile(bool chrome_frame) { "Please close Chrome and run the tests again.\n"); exit(1); } - ChromeMiniInstaller installer(false, chrome_frame, ""); FilePath path; - installer.GetInstallDirectory(&path); + installer_test::GetChromeInstallDirectory(false /* system_level */, &path); path = path.Append(mini_installer_constants::kChromeAppDir).DirName(); FilePath backup_path = path; // Will hold User Data path that needs to be backed-up. |