html_viewer: Move webcrypto to a place where html_viewer can use it.

components/webcrypto/test/test_helpers.cc

 // Copyright 2014 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.
 
-#include "content/child/webcrypto/test/test_helpers.h"
+#include "components/webcrypto/test/test_helpers.h"
 
 #include <algorithm>
 
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
-#include "content/child/webcrypto/algorithm_dispatch.h"
-#include "content/child/webcrypto/crypto_data.h"
-#include "content/child/webcrypto/generate_key_result.h"
-#include "content/child/webcrypto/jwk.h"
-#include "content/child/webcrypto/status.h"
-#include "content/child/webcrypto/webcrypto_util.h"
-#include "content/public/common/content_paths.h"
+#include "components/webcrypto/algorithm_dispatch.h"
+#include "components/webcrypto/crypto_data.h"
+#include "components/webcrypto/generate_key_result.h"
+#include "components/webcrypto/jwk.h"
+#include "components/webcrypto/status.h"
+#include "components/webcrypto/webcrypto_util.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
 #include "third_party/re2/re2/re2.h"
 
 #if !defined(USE_OPENSSL)
 #include <nss.h>
 #include <pk11pub.h>
 
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
 #endif
 
-namespace content {
-
 namespace webcrypto {
 
 void PrintTo(const Status& status, ::std::ostream* os) {
   *os << StatusToString(status);
 }
 
 bool operator==(const Status& a, const Status& b) {
   if (a.IsSuccess() != b.IsSuccess())
     return false;
   if (a.IsSuccess())
@@ skipping 122 matching lines @@
 
 std::vector<uint8_t> MakeJsonVector(const base::DictionaryValue& dict) {
   std::string json;
   base::JSONWriter::Write(&dict, &json);
   return MakeJsonVector(json);
 }
 
 ::testing::AssertionResult ReadJsonTestFile(const char* test_file_name,
                                             scoped_ptr<base::Value>* value) {
   base::FilePath test_data_dir;
-  if (!PathService::Get(DIR_TEST_DATA, &test_data_dir))
+  if (!PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir))
     return ::testing::AssertionFailure() << "Couldn't retrieve test dir";
 
-  base::FilePath file_path =
-      test_data_dir.AppendASCII("webcrypto").AppendASCII(test_file_name);
+  base::FilePath file_path = test_data_dir.AppendASCII("components")
+                                 .AppendASCII("test")
+                                 .AppendASCII("data")
+                                 .AppendASCII("webcrypto")
+                                 .AppendASCII(test_file_name);
 
   std::string file_contents;
   if (!base::ReadFileToString(file_path, &file_contents)) {
     return ::testing::AssertionFailure()
            << "Couldn't read test file: " << file_path.value();
   }
 
   // Strip C++ style comments out of the "json" file, otherwise it cannot be
   // parsed.
   re2::RE2::GlobalReplace(&file_contents, re2::RE2("\\s*//.*"), "");
@@ skipping 483 matching lines @@
     return blink::WebCryptoNamedCurveP384;
   if (curve_str == "P-521")
     return blink::WebCryptoNamedCurveP521;
   else
     ADD_FAILURE() << "Unrecognized curve name: " << curve_str;
 
   return blink::WebCryptoNamedCurveP384;
 }
 
 }  // namespace webcrypto
-
-}  // namesapce content