content: ResourceType cleanup.

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

Index: chrome/browser/chromeos/login/signin/merge_session_throttle.cc
diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
index 259e84bddeb2149107e9be5fbdf594378aa49809..ddc90ebe3186bc5fd159b83593cfe900aca28698 100644
--- a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
+++ b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
@@ -73,7 +73,7 @@ ProfileSet* ProfileSet::Get() {
 base::AtomicRefCount MergeSessionThrottle::all_profiles_restored_(0);
 
 MergeSessionThrottle::MergeSessionThrottle(net::URLRequest* request,
-                                           ResourceType::Type resource_type)
+                                           ResourceType resource_type)
     : request_(request),
       resource_type_(resource_type) {
 }
@@ -243,7 +243,7 @@ bool MergeSessionThrottle::ShouldDelayRequest(
 
 // static.
 void MergeSessionThrottle::DeleayResourceLoadingOnUIThread(
-    ResourceType::Type resource_type,
+    ResourceType resource_type,
     int render_process_id,
     int render_view_id,
     const GURL& url,
@@ -258,12 +258,12 @@ void MergeSessionThrottle::DeleayResourceLoadingOnUIThread(
         RenderViewHost::FromID(render_process_id, render_view_id);
     WebContents* web_contents = render_view_host ?
         WebContents::FromRenderViewHost(render_view_host) : NULL;
-    if (resource_type == ResourceType::MAIN_FRAME) {
+    if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME) {
       DVLOG(1) << "Creating page waiter for " << url.spec();
       (new chromeos::MergeSessionLoadPage(web_contents, url, callback))->Show();
     } else {
       DVLOG(1) << "Creating XHR waiter for " << url.spec();
-      DCHECK(resource_type == ResourceType::XHR);
+      DCHECK(resource_type == content::RESOURCE_TYPE_XHR);
       Profile* profile = Profile::FromBrowserContext(
           web_contents->GetBrowserContext());
       (new chromeos::MergeSessionXHRRequestWaiter(profile,