Fix build break from previous change (files moved in between try bot run and commit).

Review URL: http://codereview.chromium.org/6379003

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

chrome/browser/pdf_unsupported_feature.cc

@@ -4,8 +4,6 @@
 
 #include "chrome/browser/pdf_unsupported_feature.h"
 
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
@@ -18,6 +16,8 @@
 #include "chrome/common/jstemplate_builder.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugininfo.h"

chrome/browser/plugin_service.cc

@@ -366,7 +366,7 @@ bool PluginService::GetFirstAllowedPluginInfo(
   return false;
 #else
   {
-    AutoLock auto_lock(overridden_plugins_lock_);
+    base::AutoLock auto_lock(overridden_plugins_lock_);
     for (size_t i = 0; i < overridden_plugins_.size(); ++i) {
       if (overridden_plugins_[i].render_process_id == render_process_id &&
           overridden_plugins_[i].render_view_id == render_view_id &&
@@ -462,7 +462,7 @@ void PluginService::Observe(NotificationType type,
     case NotificationType::RENDERER_PROCESS_CLOSED: {
       int render_process_id = Source<RenderProcessHost>(source).ptr()->id();
 
-      AutoLock auto_lock(overridden_plugins_lock_);
+      base::AutoLock auto_lock(overridden_plugins_lock_);
       for (size_t i = 0; i < overridden_plugins_.size(); ++i) {
         if (overridden_plugins_[i].render_process_id == render_process_id) {
           overridden_plugins_.erase(overridden_plugins_.begin() + i);
@@ -493,7 +493,7 @@ bool PluginService::PrivatePluginAllowedForURL(const FilePath& plugin_path,
 }
 
 void PluginService::OverridePluginForTab(OverriddenPlugin plugin) {
-  AutoLock auto_lock(overridden_plugins_lock_);
+  base::AutoLock auto_lock(overridden_plugins_lock_);
   overridden_plugins_.push_back(plugin);
 }