Move the remaning files in content\common to the content namespace.

Review URL: https://codereview.chromium.org/11235068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163732 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 5 deletions

diff --git a/content/plugin/plugin_main_mac.mm b/content/plugin/plugin_main_mac.mm
index c8dddfd..2ee85fa 100644
--- a/content/plugin/plugin_main_mac.mm
+++ b/content/plugin/plugin_main_mac.mm
@@ -18,8 +18,7 @@ void TrimInterposeEnvironment() {
   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 @@ void TrimInterposeEnvironment() {
   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";
   }