chrome/installer/util/shell_util_unittest.cc - Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

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/shell_util_unittest.cc

Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert bad indentation, rebase Created 9 years, 8 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:

Index: chrome/installer/util/shell_util_unittest.cc

diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc

index b14007e5a5f0c26801b9083cc4dc5e7d9dfcb3c7..345c1e744ffcb05a22526b77aee72be59404551d 100644

--- a/chrome/installer/util/shell_util_unittest.cc

+++ b/chrome/installer/util/shell_util_unittest.cc

@@ -10,8 +10,8 @@

#include "base/file_util.h"

#include "base/path_service.h"

-#include "base/scoped_comptr_win.h"

#include "base/memory/scoped_temp_dir.h"

+#include "base/win/scoped_comptr.h"

#include "chrome/installer/util/browser_distribution.h"

#include "chrome/installer/util/master_preferences.h"

#include "chrome/installer/util/shell_util.h"

@@ -22,8 +22,8 @@ bool VerifyChromeShortcut(const std::wstring& exe_path,

const std::wstring& shortcut,

const std::wstring& description,

int icon_index) {

- ScopedComPtr<IShellLink> i_shell_link;

- ScopedComPtr<IPersistFile> i_persist_file;

+ base::win::ScopedComPtr<IShellLink> i_shell_link;

+ base::win::ScopedComPtr<IPersistFile> i_persist_file;

// Get pointer to the IShellLink interface

bool failed = FAILED(i_shell_link.CreateInstance(CLSID_ShellLink, NULL,

« no previous file with comments | « chrome/common/win_safe_util.cc ('k') | chrome/service/cloud_print/print_system_win.cc » ('j') | no next file with comments »