Move resource_type.* from webkit/ to content/.

chrome/browser/chromeos/login/signin/merge_session_throttle.cc

 // Copyright 2014 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/login/signin/merge_session_throttle.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 using content::BrowserThread;
 using content::RenderViewHost;
+using content::ResourceType;
 using content::WebContents;
 
 namespace {
 
 const int64 kMaxSessionRestoreTimeInSec = 60;
 
 // The set of blocked profiles.
 class ProfileSet : public base::NonThreadSafe,
                    public std::set<Profile*> {
  public:
@@ skipping 219 matching lines @@
       Profile* profile = Profile::FromBrowserContext(
           web_contents->GetBrowserContext());
       (new chromeos::MergeSessionXHRRequestWaiter(profile,
                                                   callback))->StartWaiting();
     }
   } else {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, callback);
   }
 }