Move resource_type.* from webkit/ to content/.

chrome/browser/captive_portal/captive_portal_tab_helper_unittest.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/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using captive_portal::CaptivePortalResult;
+using content::ResourceType;
 
 namespace {
 
 const char* const kHttpUrl = "http://whatever.com/";
 const char* const kHttpsUrl = "https://whatever.com/";
 
 // Used for cross-process navigations.  Shouldn't actually matter whether this
 // is different from kHttpsUrl, but best to keep things consistent.
 const char* const kHttpsUrl2 = "https://cross_process.com/";
 
@@ skipping 593 matching lines @@
   EXPECT_FALSE(tab_helper().IsLoginTab());
 
   ObservePortalResult(captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL,
                       captive_portal::RESULT_NO_RESPONSE);
   EXPECT_FALSE(tab_helper().IsLoginTab());
 
   ObservePortalResult(captive_portal::RESULT_NO_RESPONSE,
                       captive_portal::RESULT_INTERNET_CONNECTED);
   EXPECT_FALSE(tab_helper().IsLoginTab());
 }