diff options
author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 19:25:28 +0000 |
---|---|---|
committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 19:25:28 +0000 |
commit | 33cd0041d46c0593dfb90a87e861ca47976fab49 (patch) | |
tree | 2f3328ddf8d1044211943564e12348b7224afd72 /chrome/service/cloud_print | |
parent | 1ce52aae084f6a0201c64141e35772fc70bab1f0 (diff) | |
download | chromium_src-33cd0041d46c0593dfb90a87e861ca47976fab49.zip chromium_src-33cd0041d46c0593dfb90a87e861ca47976fab49.tar.gz chromium_src-33cd0041d46c0593dfb90a87e861ca47976fab49.tar.bz2 |
Adding the sync-notification-host command line parameter to the integration tests.
The sync integration tests currently access the network to communicate
with the notification server. We need to move to a model where all
server accesses are stubbed out by local servers. This is the first step
towards implementing a local notification server.
BUG=53933,53931
TEST=sync_integration_tests
First time committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=58768
Review URL: http://codereview.chromium.org/3326007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/cloud_print')
-rw-r--r-- | chrome/service/cloud_print/cloud_print_proxy_backend.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index b0e621f..865ec8e 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc @@ -14,6 +14,7 @@ #include "chrome/service/cloud_print/printer_job_handler.h" #include "chrome/service/gaia/service_gaia_authenticator.h" #include "chrome/service/service_process.h" +#include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/mediator_thread_impl.h" #include "jingle/notifier/listener/talk_mediator_impl.h" @@ -301,13 +302,12 @@ void CloudPrintProxyBackend::Core::DoInitializeWithToken( // TODO(sanjeevr): Validate the tokens. auth_token_ = cloud_print_token; - const bool kUseChromeAsyncSocket = true; - const bool kTrySslTcpFirst = false; + const notifier::NotifierOptions kNotifierOptions; const bool kInitializeSsl = true; const bool kConnectImmediately = false; const bool kInvalidateXmppAuthToken = false; talk_mediator_.reset(new notifier::TalkMediatorImpl( - new notifier::MediatorThreadImpl(kUseChromeAsyncSocket, kTrySslTcpFirst), + new notifier::MediatorThreadImpl(kNotifierOptions), kInitializeSsl, kConnectImmediately, kInvalidateXmppAuthToken)); talk_mediator_->AddSubscribedServiceUrl(kCloudPrintTalkServiceUrl); talk_mediator_->SetDelegate(this); |