Merge requested by sheriff kliegs to fix chromeos test redness.

chrome/browser/chromeos/net/network_change_notifier_chromeos.cc

 // Copyright (c) 2011 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/chromeos/net/network_change_notifier_chromeos.h"
 
 #include "base/task.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/browser/browser_thread.h"
 
 namespace {
 
 // Delay for online change notification reporting.
 const int kOnlineNotificationDelayMS = 500;
+const int kInitialNotificationCheckDelayMS = 1000;
 
 bool IsOnline(chromeos::ConnectionState state) {
-  return state == chromeos::STATE_ONLINE;
+  return state == chromeos::STATE_ONLINE ||
+         state == chromeos::STATE_PORTAL;
 }
 
 }
 
 namespace chromeos {
 
 // Task for fetching tokens from UI thread.
 class OnlineStatusReportThreadTask : public CancelableTask {
  public:
   OnlineStatusReportThreadTask(NetworkChangeNotifierChromeos* parent,
@@ skipping 34 matching lines @@
       online_notification_task_(NULL) {
 
   chromeos::NetworkLibrary* net =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   net->AddNetworkManagerObserver(this);
 
   chromeos::PowerLibrary* power =
       chromeos::CrosLibrary::Get()->GetPowerLibrary();
   power->AddObserver(this);
 
+  UpdateNetworkState(net);
   BrowserThread::PostDelayedTask(
          BrowserThread::UI, FROM_HERE,
          NewRunnableFunction(
              &NetworkChangeNotifierChromeos::UpdateInitialState, this),
-         kOnlineNotificationDelayMS);
+         kInitialNotificationCheckDelayMS);
 }
 
 NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
   if (online_notification_task_) {
     online_notification_task_->Cancel();
     online_notification_task_ = NULL;
   }
   if (!chromeos::CrosLibrary::Get())
     return;
   chromeos::NetworkLibrary* lib =
@@ skipping 167 matching lines @@
 
 // static
 void NetworkChangeNotifierChromeos::UpdateInitialState(
     NetworkChangeNotifierChromeos* self) {
   chromeos::NetworkLibrary* net =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   self->UpdateNetworkState(net);
 }
 
 }  // namespace net