[Doodle] Pull a doodle_types.h out of doodle_fetcher.h

components/doodle/doodle_fetcher.h

 // Copyright 2017 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.
 
 #ifndef COMPONENTS_DOODLE_DOODLE_FETCHER_H_
 #define COMPONENTS_DOODLE_DOODLE_FETCHER_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
+#include "components/doodle/doodle_types.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 class GoogleURLTracker;
 
 namespace base {
 class Clock;
 class DictionaryValue;
 class Value;
 }
 
 namespace doodle {
 
-enum class DoodleState {
-  AVAILABLE,
-  NO_DOODLE,
-  DOWNLOAD_ERROR,
-  PARSING_ERROR,
-};
-
-enum class DoodleType {
-  UNKNOWN,
-  SIMPLE,
-  RANDOM,
-  VIDEO,
-  INTERACTIVE,
-  INLINE_INTERACTIVE,
-  SLIDESHOW,
-};
-
-// Information about a Doodle image. If the image is invalid, the |url| will be
-// empty and invalid. By default the dimensions are 0.
-struct DoodleImage {
-  DoodleImage();
-  ~DoodleImage();
-
-  GURL url;
-  int height;
-  int width;
-  bool is_animated_gif;
-  bool is_cta;
-
-  // Copying and assignment allowed.
-};
-
-// All information about a current doodle that can be fetched from the remote
-// end. By default, all URLs are empty and therefore invalid.
-struct DoodleConfig {
-  DoodleConfig();
-  DoodleConfig(const DoodleConfig& config);  // = default;
-  ~DoodleConfig();
-
-  DoodleType doodle_type;
-  std::string alt_text;
-  std::string interactive_html;
-
-  base::Time expiry_date;
-  GURL search_url;
-  GURL target_url;
-  GURL fullpage_interactive_url;
-
-  DoodleImage large_image;
-  DoodleImage large_cta_image;
-  DoodleImage transparent_large_image;
-};
-
 // This class provides information about any recent doodle.
 // It works asynchronously and calls a callback when finished fetching the
 // information from the remote enpoint.
 class DoodleFetcher : public net::URLFetcherDelegate {
  public:
   // Callback that is invoked when the fetching is done.
   // |doodle_config| will only contain a value if |state| is AVAILABLE.
   using FinishedCallback = base::OnceCallback<void(
       DoodleState state,
       const base::Optional<DoodleConfig>& doodle_config)>;
@@ skipping 58 matching lines @@
   std::unique_ptr<net::URLFetcher> fetcher_;
 
   base::WeakPtrFactory<DoodleFetcher> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DoodleFetcher);
 };
 
 }  // namespace doodle
 
 #endif  // COMPONENTS_DOODLE_DOODLE_FETCHER_H_