content: ResourceType cleanup.

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 55 matching lines @@
 
 ProfileSet* ProfileSet::Get() {
   return g_blocked_profiles.Pointer();
 }
 
 }  // namespace
 
 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) {
 }
 
 MergeSessionThrottle::~MergeSessionThrottle() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 void MergeSessionThrottle::WillStartRequest(bool* defer) {
   if (!ShouldDelayUrl(request_->url()))
@@ skipping 149 matching lines @@
       return false;
     }
   }
 
   NOTREACHED();
   return false;
 }
 
 // static.
 void MergeSessionThrottle::DeleayResourceLoadingOnUIThread(
-    ResourceType::Type resource_type,
+    ResourceType resource_type,
     int render_process_id,
     int render_view_id,
     const GURL& url,
     const CompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (ShouldDelayRequest(render_process_id, render_view_id)) {
     // There is a chance that the tab closed after we decided to show
     // the offline page on the IO thread and before we actually show the
     // offline page here on the UI thread.
     RenderViewHost* render_view_host =
         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,
                                                   callback))->StartWaiting();
     }
   } else {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, callback);
   }
 }