Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Side by Side Diff: chrome/common/extensions/unpacker_unittest.cc

Issue 12091115: Allow manifest handlers to declare keys they depend on that must be parsed before them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dcronin Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/files/scoped_temp_dir.h" 6 #include "base/files/scoped_temp_dir.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 16 matching lines...) Expand all
27 class UnpackerTest : public testing::Test { 27 class UnpackerTest : public testing::Test {
28 public: 28 public:
29 ~UnpackerTest() { 29 ~UnpackerTest() {
30 LOG(WARNING) << "Deleting temp dir: " 30 LOG(WARNING) << "Deleting temp dir: "
31 << temp_dir_.path().LossyDisplayName(); 31 << temp_dir_.path().LossyDisplayName();
32 LOG(WARNING) << temp_dir_.Delete(); 32 LOG(WARNING) << temp_dir_.Delete();
33 } 33 }
34 34
35 virtual void SetUp() OVERRIDE { 35 virtual void SetUp() OVERRIDE {
36 testing::Test::SetUp(); 36 testing::Test::SetUp();
37 extensions::ManifestHandler::Register(keys::kDefaultLocale, 37 extensions::ManifestHandler::Register(
38 new extensions::DefaultLocaleHandler); 38 keys::kDefaultLocale,
39 make_linked_ptr(new extensions::DefaultLocaleHandler));
39 } 40 }
40 41
41 void SetupUnpacker(const std::string& crx_name) { 42 void SetupUnpacker(const std::string& crx_name) {
42 FilePath original_path; 43 FilePath original_path;
43 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &original_path)); 44 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &original_path));
44 original_path = original_path.AppendASCII("extensions") 45 original_path = original_path.AppendASCII("extensions")
45 .AppendASCII("unpacker") 46 .AppendASCII("unpacker")
46 .AppendASCII(crx_name); 47 .AppendASCII(crx_name);
47 ASSERT_TRUE(file_util::PathExists(original_path)) << original_path.value(); 48 ASSERT_TRUE(file_util::PathExists(original_path)) << original_path.value();
48 49
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 SetupUnpacker("bad_image.crx"); 272 SetupUnpacker("bad_image.crx");
272 EXPECT_FALSE(unpacker_->Run()); 273 EXPECT_FALSE(unpacker_->Run());
273 EXPECT_TRUE(StartsWith(unpacker_->error_message(), 274 EXPECT_TRUE(StartsWith(unpacker_->error_message(),
274 ASCIIToUTF16(kExpected), 275 ASCIIToUTF16(kExpected),
275 false)) << "Expected prefix: \"" << kExpected 276 false)) << "Expected prefix: \"" << kExpected
276 << "\", actual error: \"" << unpacker_->error_message() 277 << "\", actual error: \"" << unpacker_->error_message()
277 << "\""; 278 << "\"";
278 } 279 }
279 280
280 } // namespace extensions 281 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698