Refactor AutomationProvider::InitialLoadsComplete.

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2012 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/automation/automation_provider.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 253 matching lines @@
 void AutomationProvider::SetExpectedTabCount(size_t expected_tabs) {
   if (expected_tabs == 0)
     OnInitialTabLoadsComplete();
   else
     initial_load_observer_.reset(new InitialLoadObserver(expected_tabs, this));
 }
 
 void AutomationProvider::OnInitialTabLoadsComplete() {
   initial_tab_loads_complete_ = true;
   VLOG(2) << "OnInitialTabLoadsComplete";
-  if (is_connected_ && network_library_initialized_ && login_webui_ready_)
-    Send(new AutomationMsg_InitialLoadsComplete());
+  SendInitialLoadMessage();
 }
 
 void AutomationProvider::OnNetworkLibraryInit() {
   network_library_initialized_ = true;
   VLOG(2) << "OnNetworkLibraryInit";
-  if (is_connected_ && initial_tab_loads_complete_ && login_webui_ready_)
-    Send(new AutomationMsg_InitialLoadsComplete());
+  SendInitialLoadMessage();
 }
 
 void AutomationProvider::OnLoginWebuiReady() {
   login_webui_ready_ = true;
   VLOG(2) << "OnLoginWebuiReady";
+  SendInitialLoadMessage();
+}
+
+void AutomationProvider::SendInitialLoadMessage() {
   if (is_connected_ && initial_tab_loads_complete_ &&
-      network_library_initialized_)
+      network_library_initialized_ && login_webui_ready_) {
+    LOG(INFO) << "Initial loads complete; sending initial loads message.";
     Send(new AutomationMsg_InitialLoadsComplete());
+  }
 }
 
 void AutomationProvider::AddLoginHandler(NavigationController* tab,
                                          LoginHandler* handler) {
   login_handler_map_[tab] = handler;
 }
 
 void AutomationProvider::RemoveLoginHandler(NavigationController* tab) {
   DCHECK(login_handler_map_[tab]);
   login_handler_map_.erase(tab);
@@ skipping 68 matching lines @@
   ExtensionService* service = profile_->GetExtensionService();
   if (extension && service &&
       service->GetExtensionById(extension->id(), true) &&
       !service->GetExtensionById(extension->id(), false))
     return extension;
   return NULL;
 }
 
 void AutomationProvider::OnChannelConnected(int pid) {
   is_connected_ = true;
-  LOG(INFO) << "Testing channel connected, sending hello message";
 
   // Send a hello message with our current automation protocol version.
+  LOG(INFO) << "Testing channel connected, sending hello message";
   channel_->Send(new AutomationMsg_Hello(GetProtocolVersion()));
-  if (initial_tab_loads_complete_ && network_library_initialized_ &&
-      login_webui_ready_)
-    Send(new AutomationMsg_InitialLoadsComplete());
+
+  SendInitialLoadMessage();
 }
 
 void AutomationProvider::OnEndTracingComplete() {
   IPC::Message* reply_message = tracing_data_.reply_message.release();
   if (reply_message) {
     AutomationMsg_EndTracing::WriteReplyParams(
         reply_message, tracing_data_.trace_output.size(), true);
     Send(reply_message);
   }
 }
@@ skipping 604 matching lines @@
     }
   }
 }
 
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab);
   if (web_contents)
     web_contents->OnSavePage();
 }