chrome/installer/util/run_all_unittests.cc - Issue 11050009: Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we …

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/installer/util/run_all_unittests.cc

Issue 11050009: Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/installer/setup/setup_main.cc ('k') | chrome/service/cloud_print/print_system_win.cc » ('j') | chrome_frame/test/reliability/reliability_test_suite.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/run_all_unittests.cc

===================================================================

--- chrome/installer/util/run_all_unittests.cc (revision 159813)

+++ chrome/installer/util/run_all_unittests.cc (working copy)

@@ -2,9 +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 "base/win/scoped_com_initializer.h"

#include "chrome/common/chrome_paths.h"

int main(int argc, char** argv) {

@@ -13,10 +12,6 @@

// Register Chrome Path provider so that we can get test data dir.

chrome::RegisterPathProvider();

- if (CoInitializeEx(NULL, COINIT_APARTMENTTHREADED) != S_OK)

- return -1;

- int ret = test_suite.Run();

- CoUninitialize();

- return ret;

+ base::win::ScopedCOMInitializer com_initializer;

+ return com_initializer.succeeded() ? test_suite.Run() : -1;

}