chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc - Issue 22299009: Move channel-related (Chrome-specific) global state out of Feature.

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/messaging/native_message_process_host_unittest.cc

Issue 22299009: Move channel-related (Chrome-specific) global state out of Feature. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/api/extension_action/script_badge_apitest.cc ('k') | chrome/browser/extensions/extension_browsertest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc

diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc

index 8653d10646d4395ad08a285bef7a18dcd7ec6f1c..9024283b7a02028e957573f90650e9fe4b9fa64d 100644

--- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc

+++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc

@@ -26,7 +26,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

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

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

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

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

#include "content/public/test/test_browser_thread_bundle.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -144,7 +144,7 @@ class NativeMessagingTest : public ::testing::Test,

// Force the channel to be dev.

base::ScopedTempDir temp_dir_;

- Feature::ScopedCurrentChannel current_channel_;

+ ScopedCurrentChannel current_channel_;

scoped_ptr<NativeMessageProcessHost> native_message_process_host_;

base::FilePath user_data_dir_;

scoped_ptr<base::RunLoop> read_message_run_loop_;