diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 22:10:28 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 22:10:28 +0000 |
| commit | c113b2176d7e2230ab4830ccdb2b2e04eb141f1c (patch) | |
| tree | fe75864eb318a6911874b508ab1686a57a0630f3 /chrome/installer/util/run_all_unittests.cc | |
| parent | 06860a0a47ebde09b6901039397c7c1f50b3d3eb (diff) | |
| download | chromium_src-c113b2176d7e2230ab4830ccdb2b2e04eb141f1c.zip chromium_src-c113b2176d7e2230ab4830ccdb2b2e04eb141f1c.tar.gz chromium_src-c113b2176d7e2230ab4830ccdb2b2e04eb141f1c.tar.bz2 | |
Chrome updates should not change shortcut icon if there is an index specified in prefs file.
BUG=none
TEST=Specify a chrome with alternative icon (using master prefs), install an update and make sure the icon doesnt change.
Review URL: http://codereview.chromium.org/455041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/run_all_unittests.cc')
| -rw-r--r-- | chrome/installer/util/run_all_unittests.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/installer/util/run_all_unittests.cc b/chrome/installer/util/run_all_unittests.cc index b559d23..79a2e4b 100644 --- a/chrome/installer/util/run_all_unittests.cc +++ b/chrome/installer/util/run_all_unittests.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <shlobj.h> + #include "base/test/test_suite.h" #include "chrome/common/chrome_paths.h" @@ -11,5 +13,10 @@ int main(int argc, char** argv) { // Register Chrome Path provider so that we can get test data dir. chrome::RegisterPathProvider(); - return test_suite.Run(); + if (CoInitializeEx(NULL, COINIT_APARTMENTTHREADED) != S_OK) + return -1; + + int ret = test_suite.Run(); + CoUninitialize(); + return ret; } |