chrome/test/base/testing_profile.h - Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros

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/test/base/testing_profile.h

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 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

« chrome/browser/chromeos/proxy_config_service_impl.h ('K') | « chrome/test/base/testing_browser_process.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | chrome/test/pyautolib/pyauto.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/testing_profile.h

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

--- chrome/test/base/testing_profile.h (revision 106059)

+++ chrome/test/base/testing_profile.h (working copy)

@@ -261,7 +261,11 @@

}

#endif // defined(OS_CHROMEOS)

+#if defined(OS_CHROMEOS)

+ virtual chromeos::ProxyConfigServiceImpl* GetProxyConfigTracker();

+#else

virtual PrefProxyConfigTracker* GetProxyConfigTracker();

+#endif // defined(OS_CHROMEOS)

// Schedules a task on the history backend and runs a nested loop until the

// task is processed. This has the effect of blocking the caller until the

@@ -382,7 +386,11 @@

extension_special_storage_policy_;

// The proxy prefs tracker.

- scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;

+#if defined(OS_CHROMEOS)

+ scoped_ptr<chromeos::ProxyConfigServiceImpl> pref_proxy_config_tracker_;

+#else

+ scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;

+#endif // defined(OS_CHROMEOS)

// We use a temporary directory to store testing profile data. In a multi-

// profile environment, this is invalid and the directory is managed by the