Replace 'ResourceRequest::TargetType' with 'ResourceRequest::RequestContext'.

public/platform/WebURLRequest.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 70 matching lines @@
         TargetIsSharedWorker = 10,
         TargetIsPrefetch = 11,
         TargetIsFavicon = 12,
         TargetIsXHR = 13,
         TargetIsTextTrack = 14,
         TargetIsPing = 15,
         TargetIsServiceWorker = 16,
         TargetIsUnspecified = 17,
     };
 
+    // FIXME: Drop the TargetType enum once embedders are updated upstream.
+    enum RequestContext {
+        UnspecifiedContext = 0,

[abarth-chromium, 2014/07/01 14:50:54]

The normal naming we use in the API would be:

RequestContextUnspecified
RequestContextAudio

etc

[Mike West, 2014/07/01 15:00:20]

Find and replace to the rescue!

+        AudioContext,
+        ConnectContext,
+        DownloadContext,
+        FaviconContext,
+        FontContext,
+        FormContext,
+        ImageContext,
+        MainFrameContext,
+        ManifestContext,
+        ObjectContext,
+        ObjectRequestContext,
+        PingContext,
+        PopupContext,
+        PrefetchContext,
+        ScriptContext,
+        ServiceWorkerContext,
+        SharedWorkerContext,
+        StyleContext,
+        SubFrameContext,
+        SubresourceContext,
+        TextTrackContext,
+        VideoContext,
+        WorkerContext
+    };
+
     class ExtraData {
     public:
         virtual ~ExtraData() { }
     };
 
     ~WebURLRequest() { reset(); }
 
     WebURLRequest() : m_private(0) { }
     WebURLRequest(const WebURLRequest& r) : m_private(0) { assign(r); }
     WebURLRequest& operator=(const WebURLRequest& r)
@@ skipping 46 matching lines @@
     // Controls whether upload progress events are generated when a request
     // has a body.
     BLINK_PLATFORM_EXPORT bool reportUploadProgress() const;
     BLINK_PLATFORM_EXPORT void setReportUploadProgress(bool);
 
     // Controls whether actual headers sent and received for request are
     // collected and reported.
     BLINK_PLATFORM_EXPORT bool reportRawHeaders() const;
     BLINK_PLATFORM_EXPORT void setReportRawHeaders(bool);
 
+    // FIXME: Remove these once content/ and net/ are updated.
     BLINK_PLATFORM_EXPORT TargetType targetType() const;
     BLINK_PLATFORM_EXPORT void setTargetType(TargetType);
 
+    BLINK_PLATFORM_EXPORT RequestContext requestContext() const;
+    BLINK_PLATFORM_EXPORT void setRequestContext(RequestContext);
+
     BLINK_PLATFORM_EXPORT WebReferrerPolicy referrerPolicy() const;
 
     // Adds an HTTP origin header if it is empty and the HTTP method of the
     // request requires it.
     BLINK_PLATFORM_EXPORT void addHTTPOriginIfNeeded(const WebString& origin);
 
     // True if the request was user initiated.
     BLINK_PLATFORM_EXPORT bool hasUserGesture() const;
     BLINK_PLATFORM_EXPORT void setHasUserGesture(bool);
 
@@ skipping 26 matching lines @@
     BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
 
     BLINK_PLATFORM_EXPORT Priority priority() const;
     BLINK_PLATFORM_EXPORT void setPriority(Priority);
 
 #if INSIDE_BLINK
     BLINK_PLATFORM_EXPORT WebCore::ResourceRequest& toMutableResourceRequest();
     BLINK_PLATFORM_EXPORT const WebCore::ResourceRequest& toResourceRequest() const;
 #endif
 
+    // FIXME: Drop these once we replace TargetType upstream.
+    static RequestContext requestContextFromTargetType(TargetType);
+    static TargetType targetTypeFromRequestContext(RequestContext);
 protected:
     BLINK_PLATFORM_EXPORT void assign(WebURLRequestPrivate*);
 
 private:
     WebURLRequestPrivate* m_private;
 };
 
 } // namespace blink
 
 #endif