summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-13 20:11:46 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-13 20:11:46 +0000
commit15e19ede41054676329caafa49f0b29065e5f1e3 (patch)
treeca14bf1cd04cf3cdbca3cc94ddfeb7963262cf9a /chrome_frame
parent6327a546320991bae670ef3d8f29bb0a00bb624a (diff)
downloadchromium_src-15e19ede41054676329caafa49f0b29065e5f1e3.zip
chromium_src-15e19ede41054676329caafa49f0b29065e5f1e3.tar.gz
chromium_src-15e19ede41054676329caafa49f0b29065e5f1e3.tar.bz2
Enable device discovery notifications.
Add kill switch for notifications. Disable notifications for task manager test. BUG=286157 Review URL: https://chromiumcodereview.appspot.com/23903024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 3922e96..bcc7792 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -523,6 +523,9 @@ void FakeExternalTab::Initialize() {
ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
CommandLine* cmd = CommandLine::ForCurrentProcess();
+ // Disable Device Discovery with switch because this test does not respect
+ // BrowserContextKeyedBaseFactory::ServiceIsNULLWhileTesting.
+ cmd->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications);
cmd->AppendSwitch(switches::kDisableWebResources);
cmd->AppendSwitch(switches::kSingleProcess);