Index: content/plugin/plugin_main_mac.mm |
=================================================================== |
--- content/plugin/plugin_main_mac.mm (revision 163632) |
+++ content/plugin/plugin_main_mac.mm (working copy) |
@@ -18,8 +18,7 @@ |
scoped_ptr<base::Environment> env(base::Environment::Create()); |
std::string interpose_list; |
- if (!env->GetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey, |
- &interpose_list)) { |
+ if (!env->GetVar(kDYLDInsertLibrariesKey, &interpose_list)) { |
LOG(INFO) << "No Carbon Interpose library found."; |
return; |
} |
@@ -35,12 +34,11 @@ |
size_t suffix_offset = interpose_list.size() - interpose_library_path.size(); |
if (suffix_offset == 0 && |
interpose_list == interpose_library_path) { |
- env->UnSetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey); |
+ env->UnSetVar(kDYLDInsertLibrariesKey); |
} else if (suffix_offset > 0 && interpose_list[suffix_offset - 1] == ':' && |
interpose_list.substr(suffix_offset) == interpose_library_path) { |
std::string trimmed_list = interpose_list.substr(0, suffix_offset - 1); |
- env->SetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey, |
- trimmed_list.c_str()); |
+ env->SetVar(kDYLDInsertLibrariesKey, trimmed_list.c_str()); |
} else { |
NOTREACHED() << "Missing Carbon interposing library"; |
} |