Patch for bug 74983 (among others) to be applied to M11 696 branch.

content/browser/plugin_service.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_
 #pragma once
@@ skipping 15 matching lines @@
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_handle.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
 
 #if defined(OS_WIN)
 #include "base/scoped_ptr.h"
 #include "base/win/registry.h"
 #endif
 
 #if defined(OS_LINUX)
-#include "chrome/browser/file_path_watcher/file_path_watcher.h"
+#include "content/common/file_path_watcher/file_path_watcher.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 namespace chromeos {
 class PluginSelectionPolicy;
 }
 #endif
 
 namespace IPC {
 class Message;
@@ skipping 176 matching lines @@
 
   std::vector<OverriddenPlugin> overridden_plugins_;
   base::Lock overridden_plugins_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginService);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_H_