chrome/browser/extensions/api/extension_action/script_badge_apitest.cc - Issue 47923018: Move FeatureSwitch to top-level extensions/

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/api/extension_action/script_badge_apitest.cc

Issue 47923018: Move FeatureSwitch to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 7 years, 1 month 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/api/extension_action/page_as_browser_action_apitest.cc ('k') | chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

index 5cd0c538a6fa84a156f8f0b091db5db44e78ad58..928090817e75860ca8ea359177231dfc805d0842 100644

--- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

+++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

@@ -13,11 +13,11 @@

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

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

-#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/extensions/features/feature_channel.h"

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

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

+#include "extensions/common/feature_switch.h"

#include "net/dns/mock_host_resolver.h"

#include "net/test/embedded_test_server/embedded_test_server.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -30,9 +30,10 @@ class ScriptBadgeApiTest : public ExtensionApiTest {

ScriptBadgeApiTest() : trunk_(chrome::VersionInfo::CHANNEL_UNKNOWN) {}

protected:

- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

- ExtensionApiTest::SetUpCommandLine(command_line);

- command_line->AppendSwitchASCII(switches::kScriptBadges, "1");

+ virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

+ ExtensionApiTest::SetUpInProcessBrowserTestFixture();

+ FeatureSwitch::script_badges()->SetOverrideValue(

+ FeatureSwitch::OVERRIDE_ENABLED);

}

private: