Extract ContentVerifierKey to its own file.

This removes the necessity of including content_verifier_delegate.h
where only ContentVerifierKey would be required.

Bug: 796395
Change-Id: Icf18f2957291c454c6e8a6971f98be7f9fd2fb78
Reviewed-on: https://chromium-review.googlesource.com/922925
Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537363}

extensions/browser/BUILD.gn

@@ -80,6 +80,7 @@ source_set("browser_sources") {
     "content_verifier.h",
     "content_verifier/content_hash.cc",
     "content_verifier/content_hash.h",
+    "content_verifier/content_verifier_key.h",
     "content_verifier_delegate.h",
     "content_verifier_io_data.cc",
     "content_verifier_io_data.h",

extensions/browser/content_verifier/content_hash.h

@@ -7,10 +7,11 @@
 
 #include <set>
 
+#include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/version.h"
 #include "extensions/browser/computed_hashes.h"
-#include "extensions/browser/content_verifier_delegate.h"
+#include "extensions/browser/content_verifier/content_verifier_key.h"
 #include "extensions/browser/verified_contents.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_id.h"

extensions/browser/content_verifier/content_verifier_key.h

+// Copyright 2018 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 EXTENSIONS_BROWSER_CONTENT_VERIFIER_CONTENT_VERIFIER_KEY_H_
+#define EXTENSIONS_BROWSER_CONTENT_VERIFIER_CONTENT_VERIFIER_KEY_H_
+
+#include <stdint.h>
+
+namespace extensions {
+
+// A pointer to the bytes of a public key, and the number of bytes for content
+// verification.
+struct ContentVerifierKey {
+  const uint8_t* data;
+  size_t size;
+
+  ContentVerifierKey(const uint8_t* data, size_t size)
+      : data(data), size(size) {}
+};
+
+}  // namespace extensions
+
+#endif  // EXTENSIONS_BROWSER_CONTENT_VERIFIER_CONTENT_VERIFIER_KEY_H_

extensions/browser/content_verifier_delegate.h

@@ -5,10 +5,9 @@
 #ifndef EXTENSIONS_BROWSER_CONTENT_VERIFIER_DELEGATE_H_
 #define EXTENSIONS_BROWSER_CONTENT_VERIFIER_DELEGATE_H_
 
-#include <stdint.h>
-
 #include <set>
 
+#include "extensions/browser/content_verifier/content_verifier_key.h"
 #include "extensions/browser/content_verify_job.h"
 #include "url/gurl.h"
 
@@ -21,15 +20,6 @@ namespace extensions {
 
 class Extension;
 
-// A pointer to the bytes of a public key, and the number of bytes.
-struct ContentVerifierKey {
-  const uint8_t* data;
-  size_t size;
-
-  ContentVerifierKey(const uint8_t* data, size_t size)
-      : data(data), size(size) {}
-};
-
 // This is an interface for clients that want to use a ContentVerifier.
 class ContentVerifierDelegate {
  public: