summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/extensions/extensions_service.cc6
-rw-r--r--chrome/browser/extensions/extensions_service_unittest.cc2
2 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 2e655d10..07c6fba 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -493,8 +493,7 @@ void ExtensionsServiceBackend::GarbageCollectExtensions(
if (!file_util::DirectoryExists(install_directory_))
return;
- if (!file_util::AbsolutePath(&install_directory_))
- NOTREACHED();
+ file_util::AbsolutePath(&install_directory_);
LOG(INFO) << "Loading installed extensions...";
@@ -546,8 +545,7 @@ void ExtensionsServiceBackend::LoadSingleExtension(
alert_on_error_ = true;
FilePath extension_path = path_in;
- if (!file_util::AbsolutePath(&extension_path))
- NOTREACHED();
+ file_util::AbsolutePath(&extension_path);
LOG(INFO) << "Loading single extension from " <<
WideToASCII(extension_path.BaseName().ToWStringHack());
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 2a4c104..c540ded 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -752,7 +752,7 @@ TEST_F(ExtensionsServiceTest, LoadExtension) {
ValidatePrefKeyCount(0);
FilePath no_manifest = extensions_path.AppendASCII("bad")
- .AppendASCII("no_manifest").AppendASCII("1");
+ .AppendASCII("cccccccccccccccccccccccccccccccc").AppendASCII("1");
service_->LoadExtension(no_manifest);
loop_.RunAllPending();
EXPECT_EQ(1u, GetErrors().size());