chrome/browser/extensions/extension_browsertest.cc - 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.cc

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: make the default stable 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

Index: chrome/browser/extensions/extension_browsertest.cc

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

index e5cd7f5e131208bc475406c515d40bd10337fa4f..31f0682048fe0ab972adf2ed96031ef0e3139362 100644

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

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

@@ -29,7 +29,7 @@

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

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

+#include "chrome/common/chrome_version_info.h"

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

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

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

@@ -57,9 +57,6 @@ ExtensionBrowserTest::~ExtensionBrowserTest() {

}

void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {

- extensions::Feature::SetChannelForTesting(

- chrome::VersionInfo::CHANNEL_UNKNOWN);

PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);

test_data_dir_ = test_data_dir_.AppendASCII("extensions");

« no previous file with comments | « chrome/browser/extensions/active_tab_unittest.cc ('k') | chrome/browser/extensions/extension_system.cc » ('j') | no next file with comments »