Send multiple queries when DiscoverNewServices is called on a service watcher

chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 38 matching lines @@
 #if defined(ENABLE_FULL_PRINTING) && !defined(OS_CHROMEOS) && \
   !defined(OS_MACOSX)
 #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE
 #endif
 
 namespace local_discovery {
 
 namespace {
 const char kPrivetAutomatedClaimURLFormat[] = "%s/confirm?token=%s";
 
-const int kInitialRequeryTimeSeconds = 1;
-const int kMaxRequeryTimeSeconds = 2; // Time for last requery
-
 int g_num_visible = 0;
-
 }  // namespace
 
 LocalDiscoveryUIHandler::LocalDiscoveryUIHandler() : is_visible_(false) {
 #if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
 #if !defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
   // On Windows, we need the PDF plugin which is only guaranteed to exist on
   // Google Chrome builds. Use a command-line switch for Windows non-Google
   //  Chrome builds.
   cloud_print_connector_ui_enabled_ =
       CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 62 matching lines @@
   if (!privet_lister_) {
     service_discovery_client_ = ServiceDiscoverySharedClient::GetInstance();
     privet_lister_.reset(new PrivetDeviceListerImpl(
         service_discovery_client_.get(), this));
     privet_http_factory_ =
         PrivetHTTPAsynchronousFactory::CreateInstance(
             service_discovery_client_.get(), profile->GetRequestContext());
   }
 
   privet_lister_->Start();
-  SendQuery(kInitialRequeryTimeSeconds);
+  privet_lister_->DiscoverNewDevices(false);
 
 #if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
   StartCloudPrintConnector();
 #endif
 
   CheckUserLoggedIn();
 
   notification_registrar_.RemoveAll();
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
@@ skipping 219 matching lines @@
   device_descriptions_.erase(name);
   scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());
   base::StringValue name_value(name);
 
   web_ui()->CallJavascriptFunction("local_discovery.onUnregisteredDeviceUpdate",
                                    name_value, *null_value);
 }
 
 void LocalDiscoveryUIHandler::DeviceCacheFlushed() {
   web_ui()->CallJavascriptFunction("local_discovery.onDeviceCacheFlushed");
-  SendQuery(kInitialRequeryTimeSeconds);
+  privet_lister_->DiscoverNewDevices(false);
 }
 
 void LocalDiscoveryUIHandler::OnCloudPrintPrinterListReady() {
   base::ListValue printer_object_list;
   std::set<std::string> local_ids;
 
   for (DeviceDescriptionMap::iterator i = device_descriptions_.begin();
        i != device_descriptions_.end();
        i++) {
     std::string device_id = i->second.id;
@@ skipping 102 matching lines @@
 
   return return_value.Pass();
 }
 
 void LocalDiscoveryUIHandler::CheckUserLoggedIn() {
   base::FundamentalValue logged_in_value(!GetSyncAccount().empty());
   web_ui()->CallJavascriptFunction("local_discovery.setUserLoggedIn",
                                    logged_in_value);
 }
 
-void LocalDiscoveryUIHandler::ScheduleQuery(int timeout_seconds) {
-  if (timeout_seconds <= kMaxRequeryTimeSeconds) {
-    requery_callback_.Reset(base::Bind(&LocalDiscoveryUIHandler::SendQuery,
-                                       base::Unretained(this),
-                                       timeout_seconds * 2));
-
-    base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE,
-        requery_callback_.callback(),
-        base::TimeDelta::FromSeconds(timeout_seconds));
-  }
-}
-
-void LocalDiscoveryUIHandler::SendQuery(int next_timeout_seconds) {
-  privet_lister_->DiscoverNewDevices(false);
-  ScheduleQuery(next_timeout_seconds);
-}
-
 #if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
 void LocalDiscoveryUIHandler::StartCloudPrintConnector() {
   Profile* profile = Profile::FromWebUI(web_ui());
 
   base::Closure cloud_print_callback = base::Bind(
       &LocalDiscoveryUIHandler::OnCloudPrintPrefsChanged,
           base::Unretained(this));
 
   if (cloud_print_connector_email_.GetPrefName().empty()) {
     cloud_print_connector_email_.Init(
@@ skipping 85 matching lines @@
 }
 
 void LocalDiscoveryUIHandler::RefreshCloudPrintStatusFromService() {
   if (cloud_print_connector_ui_enabled_)
     CloudPrintProxyServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()))->
         RefreshStatusFromService();
 }
 #endif // cloud print connector option stuff
 
 }  // namespace local_discovery