Cleaning up after a webkit roll.

BUG=39368
TEST=n/a

Review URL: http://codereview.chromium.org/1912007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46425 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 8 deletions

diff --git a/webkit/glue/resource_type.h b/webkit/glue/resource_type.h
index 140282a..aa4a072 100644
--- a/webkit/glue/resource_type.h
+++ b/webkit/glue/resource_type.h
@@ -20,8 +20,8 @@ class ResourceType {
     OBJECT,          // an object (or embed) tag for a plugin,
                      // or a resource that a plugin requested.
     MEDIA,           // a media resource.
-    SHARED_WORKER,   // the main resource of a shared worker.
     WORKER,          // the main resource of a dedicated worker.
+    SHARED_WORKER,   // the main resource of a shared worker.
     LAST_TYPE        // Place holder so we don't need to change ValidType
                      // everytime.
   };
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 0b5697a..43b0edc 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -125,14 +125,12 @@ ResourceType::Type FromTargetType(WebURLRequest::TargetType type) {
       return ResourceType::OBJECT;
     case WebURLRequest::TargetIsMedia:
       return ResourceType::MEDIA;
-    // TODO(michaeln): uncomment the following cases and the NOTREACHED() call
-    // when the webkit API has been committed and these constants are defined.
-    // case WebURLRequest::TargetIsWorker:
-    //   return ResourceType::WORKER;
-    // case WebURLRequest::TargetIsSharedWorker:
-    //  return ResourceType::SHARED_WORKER;
+    case WebURLRequest::TargetIsWorker:
+      return ResourceType::WORKER;
+    case WebURLRequest::TargetIsSharedWorker:
+      return ResourceType::SHARED_WORKER;
     default:
-      // NOTREACHED();
+      NOTREACHED();
       return ResourceType::SUB_RESOURCE;
   }
 }