Refactor CRX verification in preparation to support CRX₃ files.

components/update_client/component_unpacker_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 <iterator>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 142 matching lines @@
 // Tests a mismatch between the public key hash and the id of the component.
 TEST_F(ComponentUnpackerTest, UnpackFileHashMismatch) {
   scoped_refptr<ComponentUnpacker> component_unpacker = new ComponentUnpacker(
       std::vector<uint8_t>(std::begin(abag_hash), std::end(abag_hash)),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"), nullptr, nullptr,
       config_->GetSequencedTaskRunner());
   component_unpacker->Unpack(base::Bind(&ComponentUnpackerTest::UnpackComplete,
                                         base::Unretained(this)));
   RunThreads();
 
-  EXPECT_EQ(UnpackerError::kInvalidId, result_.error);
+  EXPECT_EQ(UnpackerError::kInvalidFile, result_.error);
   EXPECT_EQ(0, result_.extended_error);
 
   EXPECT_TRUE(result_.unpack_path.empty());
 }
 
 }  // namespace update_client