chrome/browser/extensions/extension_browsertest.h - Issue 10826199: Properly propagate the current Chrome channel into the Feature system on the

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/extensions/extension_browsertest.h

Issue 10826199: Properly propagate the current Chrome channel into the Feature system on the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup Created 8 years, 4 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/browser/extensions/active_tab_unittest.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | chrome/common/extensions/features/feature.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_browsertest.h

diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h

index 1522f73f0872c1f5062b4905d498e9cb7525fcd6..7577209648cd87ec47fe7524eff4f9b27831625c 100644

--- a/chrome/browser/extensions/extension_browsertest.h

+++ b/chrome/browser/extensions/extension_browsertest.h

@@ -13,6 +13,7 @@

#include "base/scoped_temp_dir.h"

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

#include "chrome/common/extensions/extension.h"

+#include "chrome/common/extensions/features/feature.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_observer.h"

@@ -228,6 +229,9 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,

// When waiting for visible page action count to change, we wait until it

// reaches this value.

int target_visible_page_action_count_;

+ // Ensure there is a channel set for the duration of the test.

+ extensions::Feature::ScopedCurrentChannel current_channel_;

};

#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_