chrome/browser/sync/test/integration/extension_settings_helper.cc - Issue 11826048: Revert 176015

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/browser/sync/test/integration/extension_settings_helper.cc

Issue 11826048: Revert 176015 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

Index: chrome/browser/sync/test/integration/extension_settings_helper.cc

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

--- chrome/browser/sync/test/integration/extension_settings_helper.cc (revision 176046)

+++ chrome/browser/sync/test/integration/extension_settings_helper.cc (working copy)

@@ -6,12 +6,12 @@

#include "base/bind.h"

#include "base/json/json_writer.h"

+#include "base/memory/scoped_ptr.h"

#include "base/logging.h"

-#include "base/memory/scoped_ptr.h"

#include "base/synchronization/waitable_event.h"

#include "base/values.h"

-#include "chrome/browser/extensions/api/storage/settings_frontend.h"

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/extensions/settings/settings_frontend.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sync/test/integration/extensions_helper.h"

#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"