chrome/browser/extensions/extension_service.cc - Issue 10690144: Set the Feature's ChannelForTesting to Trunk during ActiveTabTest.

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_service.cc

Issue 10690144: Set the Feature's ChannelForTesting to Trunk during ActiveTabTest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: runtime fix Created 8 years, 5 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/extensions/extension_service.cc

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

index 5f6520e065f8f2c6408c81daf6cf9d3cb6439d3c..9a13fddc15158e7b23019347f2aeef15e3074a59 100644

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

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

@@ -93,6 +93,7 @@

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

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

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

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

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

@@ -2368,7 +2369,7 @@ void ExtensionService::Observe(int type,

// Extensions need to know the channel for API restrictions.

process->Send(new ExtensionMsg_SetChannel(

- chrome::VersionInfo::GetChannel()));

+ extensions::Feature::GetCurrentChannel()));

// Valid extension function names, used to setup bindings in renderer.

std::vector<std::string> function_names;