Merge 32345 - Parse messages.json in ExtensionUnpacker (like we do for manife...

chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc

 // Copyright (c) 2009 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/ref_counted.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 58 matching lines @@
     original_path = original_path.AppendASCII("extensions")
         .AppendASCII("unpacker")
         .AppendASCII(crx_name);
     ASSERT_TRUE(file_util::PathExists(original_path)) << original_path.value();
 
     // Try bots won't let us write into DIR_TEST_DATA, so we have to create
     // a temp folder to play in.
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &install_dir_));
     install_dir_ =
       install_dir_.AppendASCII("sandboxed_extension_unpacker_test");
-    ASSERT_TRUE(file_util::Delete(install_dir_, true)) <<
-        install_dir_.value();
-    ASSERT_TRUE(file_util::CreateDirectory(install_dir_)) <<
-        install_dir_.value();
+    file_util::Delete(install_dir_, true);
+    file_util::CreateDirectory(install_dir_);
 
     FilePath crx_path = install_dir_.AppendASCII(crx_name);
     ASSERT_TRUE(file_util::CopyFile(original_path, crx_path)) <<
         "Original path: " << original_path.value() <<
         ", Crx path: " << crx_path.value();
 
     unpacker_.reset(new ExtensionUnpacker(crx_path));
 
     // It will delete itself.
     sandboxed_unpacker_ =
@@ skipping 58 matching lines @@
       .AppendASCII(Extension::kLocaleFolder)
       .AppendASCII("en_US")
       .AppendASCII(Extension::kMessagesFilename);
   EXPECT_TRUE(file_util::Delete(messages_file, false));
 
   OnUnpackSucceeded();
 
   // Check that there is _locales/en_US/messages.json file.
   EXPECT_TRUE(file_util::PathExists(messages_file));
 }