chrome/installer/util/google_chrome_distribution_unittest.cc - Issue 6288009: More installer refactoring in the interest of fixing some bugs and cleaning t...

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

Issue 6288009: More installer refactoring in the interest of fixing some bugs and cleaning t... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 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/util/google_chrome_distribution_dummy.cc ('k') | chrome/installer/util/google_chrome_sxs_distribution.h » ('j') | chrome/installer/util/installer_state.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/google_chrome_distribution_unittest.cc

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

--- chrome/installer/util/google_chrome_distribution_unittest.cc (revision 72336)

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

@@ -11,7 +11,6 @@

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

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

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

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

#include "testing/gtest/include/gtest/gtest.h"

#if defined(GOOGLE_CHROME_BUILD)

@@ -52,12 +51,9 @@

ASSERT_TRUE(root.get());

std::wstring uninstall_metrics_string;

- const installer::MasterPreferences& prefs =

- installer::MasterPreferences::ForCurrentProcess();

GoogleChromeDistribution* dist = static_cast<GoogleChromeDistribution*>(

BrowserDistribution::GetSpecificDistribution(

- BrowserDistribution::CHROME_BROWSER, prefs));

+ BrowserDistribution::CHROME_BROWSER));

EXPECT_TRUE(

dist->ExtractUninstallMetrics(*static_cast<DictionaryValue*>(root.get()),