Merge requested by sheriff kliegs to fix chromeos test redness.

chrome/browser/renderer_host/offline_resource_handler.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/renderer_host/offline_resource_handler.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
-#include "chrome/browser/chromeos/network_state_notifier.h"
 #include "chrome/browser/chromeos/offline/offline_load_page.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "net/base/net_errors.h"
+#include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 OfflineResourceHandler::OfflineResourceHandler(
     ResourceHandler* handler,
     int host_id,
     int route_id,
     ResourceDispatcherHost* rdh,
     net::URLRequest* request,
     ChromeAppCacheService* appcache_service)
@@ skipping 133 matching lines @@
 bool OfflineResourceHandler::IsRemote(const GURL& url) const {
   return url.SchemeIs(chrome::kFtpScheme) ||
          url.SchemeIs(chrome::kHttpScheme) ||
          url.SchemeIs(chrome::kHttpsScheme);
 }
 
 bool OfflineResourceHandler::ShouldShowOfflinePage(const GURL& url) const {
   // Only check main frame. If the network is disconnected while
   // loading other resources, we'll simply show broken link/images.
   return IsRemote(url) &&
-      !chromeos::NetworkStateNotifier::is_connected() &&
+      net::NetworkChangeNotifier::IsOffline() &&
       ResourceDispatcherHost::InfoForRequest(request_)->resource_type()
         == ResourceType::MAIN_FRAME;
 }
 
 void OfflineResourceHandler::Resume() {
   const GURL url = deferred_url_;
   int request_id = deferred_request_id_;
   ClearRequestInfo();
 
   bool defer = false;
   DVLOG(1) << "Resume load: this=" << this << ", request id=" << request_id;
   next_handler_->OnWillStart(request_id, url, &defer);
   if (!defer)
     rdh_->StartDeferredRequest(process_host_id_, request_id);
 }
 
 void OfflineResourceHandler::ShowOfflinePage() {
   chromeos::OfflineLoadPage::Show(
       process_host_id_, render_view_id_, deferred_url_, this);
 }