Fix localstorage data migration.

content/browser/dom_storage/local_storage_context_mojo_unittest.cc

 // Copyright 2016 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/browser/dom_storage/local_storage_context_mojo.h"
 
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 44 matching lines @@
                  std::vector<uint8_t>* value_out,
                  bool success,
                  const std::vector<uint8_t>& value) {
   *success_out = success;
   *value_out = value;
   callback.Run();
 }
 
 void NoOpGet(bool success, const std::vector<uint8_t>& value) {}
 
-std::vector<uint8_t> String16ToUint8Vector(const base::string16& input) {
-  const uint8_t* data = reinterpret_cast<const uint8_t*>(input.data());
-  return std::vector<uint8_t>(data, data + input.size() * sizeof(base::char16));
-}
-
 class TestLevelDBObserver : public mojom::LevelDBObserver {
  public:
   struct Observation {
     enum { kAdd, kChange, kDelete, kDeleteAll } type;
     std::string key;
     std::string old_value;
     std::string new_value;
     std::string source;
   };
 
@@ skipping 515 matching lines @@
   // Opening origin1 and accessing its data should migrate its storage.
   context()->OpenLocalStorage(origin1, MakeRequest(&wrapper));
   wrapper->Get(std::vector<uint8_t>(), base::Bind(&NoOpGet));
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(mock_data().empty());
 
   base::RunLoop run_loop;
   bool success = false;
   std::vector<uint8_t> result;
   wrapper->Get(
-      String16ToUint8Vector(key),
+      LocalStorageContextMojo::MigrateString(key),
       base::Bind(&GetCallback, run_loop.QuitClosure(), &success, &result));
   run_loop.Run();
   EXPECT_TRUE(success);
-  EXPECT_EQ(String16ToUint8Vector(value), result);
+  EXPECT_EQ(LocalStorageContextMojo::MigrateString(value), result);
 
   // Origin1 should no longer exist in old storage.
   area = local->OpenStorageArea(origin1.GetURL());
   ASSERT_EQ(0u, area->Length());
   local->CloseStorageArea(area);
 }
 
 namespace {
 
 class ServiceTestClient : public service_manager::test::ServiceTestClient,
@@ skipping 222 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Data should have been preserved now.
   context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), test_path);
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   EXPECT_EQ(value, result);
 }
 
 }  // namespace content