ParsedContentType refactoring

third_party/WebKit/Source/platform/network/ParsedContentType.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. 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.
@@ skipping 21 matching lines @@
 #ifndef ParsedContentType_h
 #define ParsedContentType_h
 
 #include "platform/PlatformExport.h"
 #include "wtf/Allocator.h"
 #include "wtf/HashMap.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
-// <index, length>
-typedef std::pair<unsigned, unsigned> SubstringRange;
-PLATFORM_EXPORT bool isValidContentType(const String&);
-
+// ParsedContentType parses the constructor argument as specified in RFC2045
+// and stores the result.
 // FIXME: add support for comments.
 class PLATFORM_EXPORT ParsedContentType final {
   STACK_ALLOCATED();
 
  public:
+  // <index, length>
+  using SubstringRange = std::pair<unsigned, unsigned>;
+
   explicit ParsedContentType(const String&);
 
   String mimeType() const { return m_mimeType; }
   String charset() const;
 
   // Note that in the case of multiple values for the same name, the last value
   // is returned.
   String parameterValueForName(const String&) const;
   size_t parameterCount() const;
 
+  static bool isValid(const String&);
+
  private:
-  template <class ReceiverType>
-  friend bool parseContentType(const String&, ReceiverType&);
-  void setContentType(const SubstringRange&);
-  void setContentTypeParameter(const SubstringRange&, const SubstringRange&);
+  ParsedContentType() {}
+
+  bool parse(const String&);
 
   typedef HashMap<String, String> KeyValuePairs;
-  String m_contentType;
   KeyValuePairs m_parameters;
   String m_mimeType;
 };
 
 }  // namespace blink
 
 #endif