diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 18:00:55 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 18:00:55 +0000 |
| commit | 9486892c19d4d922afb24a29ab6f8a69553a35bf (patch) | |
| tree | 5124ec2fdd0dc3c619a86fad1a1e6bfa752abc30 /chrome_frame/test | |
| parent | 5b2bacc2429b852755a2d40298adb23faa639edc (diff) | |
| download | chromium_src-9486892c19d4d922afb24a29ab6f8a69553a35bf.zip chromium_src-9486892c19d4d922afb24a29ab6f8a69553a35bf.tar.gz chromium_src-9486892c19d4d922afb24a29ab6f8a69553a35bf.tar.bz2 | |
Revert 223894 "Revert "Enable device discovery notifications.""
Re-enable device discovery. It should not regress perf after r224052.
> Revert "Enable device discovery notifications."
>
> This reverts commit 15e19ede41054676329caafa49f0b29065e5f1e3. This commit is
> being reverted since it causes a significant increase in memory usage.
>
> TBR=vitalybuka
> BUG=292754
>
> Review URL: https://codereview.chromium.org/23536066
TBR=teravest@chromium.org
Review URL: https://codereview.chromium.org/24191003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 3 |
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); |