diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 01:25:48 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 01:25:48 +0000 |
commit | ed31bae79de0365119170a992489ecc1ed85eaab (patch) | |
tree | 13828a84e2cbcc26ffcd980d4d471cc25d6c859d /chrome/browser/service | |
parent | 761d342a5307a6b858a3bfd2feaa14eb4d9830ce (diff) | |
download | chromium_src-ed31bae79de0365119170a992489ecc1ed85eaab.zip chromium_src-ed31bae79de0365119170a992489ecc1ed85eaab.tar.gz chromium_src-ed31bae79de0365119170a992489ecc1ed85eaab.tar.bz2 |
Chromoting setup flow: implemented rest of setup flow steps.
BUG=67218
TEST=None
Review URL: http://codereview.chromium.org/6033005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/service')
-rw-r--r-- | chrome/browser/service/service_process_control.cc | 15 | ||||
-rw-r--r-- | chrome/browser/service/service_process_control.h | 9 | ||||
-rw-r--r-- | chrome/browser/service/service_process_control_browsertest.cc | 31 |
3 files changed, 14 insertions, 41 deletions
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 2873ddc..0ca4729 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -238,9 +238,8 @@ void ServiceProcessControl::OnProcessLaunched() { } bool ServiceProcessControl::OnMessageReceived(const IPC::Message& message) { - bool handled = true;; + bool handled = true; IPC_BEGIN_MESSAGE_MAP(ServiceProcessControl, message) - IPC_MESSAGE_HANDLER(ServiceHostMsg_GoodDay, OnGoodDay) IPC_MESSAGE_HANDLER(ServiceHostMsg_CloudPrintProxy_IsEnabled, OnCloudPrintProxyIsEnabled) IPC_MESSAGE_HANDLER(ServiceHostMsg_RemotingHost_HostInfo, @@ -277,14 +276,6 @@ void ServiceProcessControl::Observe(NotificationType type, } } -void ServiceProcessControl::OnGoodDay() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - for (std::set<MessageHandler*>::iterator it = message_handlers_.begin(); - it != message_handlers_.end(); ++it) { - (*it)->OnGoodDay(); - } -} - void ServiceProcessControl::OnCloudPrintProxyIsEnabled(bool enabled, std::string email) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -310,10 +301,6 @@ bool ServiceProcessControl::GetCloudPrintProxyStatus( return Send(new ServiceMsg_IsCloudPrintProxyEnabled); } -bool ServiceProcessControl::SendHello() { - return Send(new ServiceMsg_Hello()); -} - bool ServiceProcessControl::Shutdown() { bool ret = Send(new ServiceMsg_Shutdown()); channel_.reset(); diff --git a/chrome/browser/service/service_process_control.h b/chrome/browser/service/service_process_control.h index 78c3141..c2f18ba 100644 --- a/chrome/browser/service/service_process_control.h +++ b/chrome/browser/service/service_process_control.h @@ -49,10 +49,6 @@ class ServiceProcessControl : public IPC::Channel::Sender, public: virtual ~MessageHandler() {} - // This is a test signal sent from the service process. This can be used - // the healthiness of the service. - virtual void OnGoodDay() = 0; - // Called when we receive reply to remoting host status request. virtual void OnRemotingHostInfo( const remoting::ChromotingHostInfo& host_info) = 0; @@ -96,14 +92,9 @@ class ServiceProcessControl : public IPC::Channel::Sender, const NotificationDetails& details); // Message handlers - void OnGoodDay(); void OnCloudPrintProxyIsEnabled(bool enabled, std::string email); void OnRemotingHostInfo(remoting::ChromotingHostInfo host_info); - // Send a hello message to the service process for testing purpose. - // Return true if the message was sent. - bool SendHello(); - // Send a shutdown message to the service process. IPC channel will be // destroyed after calling this method. // Return true if the message was sent. diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc index 519c005..9087b8d 100644 --- a/chrome/browser/service/service_process_control_browsertest.cc +++ b/chrome/browser/service/service_process_control_browsertest.cc @@ -13,8 +13,7 @@ #include "chrome/test/ui_test_utils.h" class ServiceProcessControlBrowserTest - : public InProcessBrowserTest, - public ServiceProcessControl::MessageHandler { + : public InProcessBrowserTest { public: ServiceProcessControlBrowserTest() : service_process_handle_(base::kNullProcessHandle) { @@ -46,12 +45,18 @@ class ServiceProcessControlBrowserTest ui_test_utils::RunMessageLoop(); } - void SayHelloAndWait() { - // Send a hello message to the service process and wait for a reply. - process()->SendHello(); + // Send a remoting host status request and wait reply from the service. + void SendRequestAndWait() { + process()->GetCloudPrintProxyStatus(NewCallback( + this, &ServiceProcessControlBrowserTest::CloudPrintStatusCallback)); ui_test_utils::RunMessageLoop(); } + void CloudPrintStatusCallback( + bool enabled, std::string email) { + MessageLoop::current()->Quit(); + } + void Disconnect() { // This will delete all instances of ServiceProcessControl and close the IPC // connections. @@ -72,7 +77,6 @@ class ServiceProcessControlBrowserTest service_pid, base::kProcessAccessWaitForTermination, &service_process_handle_)); - process()->AddMessageHandler(this); // Quit the current message. Post a QuitTask instead of just calling Quit() // because this can get invoked in the context of a Launch() call and we // may not be in Run() yet. @@ -85,15 +89,6 @@ class ServiceProcessControlBrowserTest MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); } - // ServiceProcessControl::MessageHandler implementations. - virtual void OnGoodDay() { - MessageLoop::current()->Quit(); - } - - virtual void OnRemotingHostInfo( - const remoting::ChromotingHostInfo& host_info) { - } - ServiceProcessControl* process() { return process_; } private: @@ -109,7 +104,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, LaunchAndIPC) { // Make sure we are connected to the service process. EXPECT_TRUE(process()->is_connected()); - SayHelloAndWait(); + SendRequestAndWait(); // And then shutdown the service process. EXPECT_TRUE(process()->Shutdown()); @@ -123,12 +118,12 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, LaunchTwice) { // Make sure we are connected to the service process. EXPECT_TRUE(process()->is_connected()); - SayHelloAndWait(); + SendRequestAndWait(); // Launch the service process again. LaunchServiceProcessControl(); EXPECT_TRUE(process()->is_connected()); - SayHelloAndWait(); + SendRequestAndWait(); // And then shutdown the service process. EXPECT_TRUE(process()->Shutdown()); |