Move webpreferences.* from webkit/ to content/

content/shell/browser/webkit_test_controller.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
 #define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
 
 #include <ostream>
 #include <string>
 
 #include "base/cancelable_callback.h"
 #include "base/files/file_path.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/webpreferences.h"
 #include "content/shell/common/leak_detection_result.h"
 #include "ui/gfx/size.h"
-#include "webkit/common/webpreferences.h"
 
 #if defined(OS_ANDROID)
 #include "base/threading/thread_restrictions.h"
 #endif
 
 class SkBitmap;
 
 namespace content {
 
 class Shell;
@@ skipping 186 matching lines @@
   // waiting on the UI thread while layout tests are being ran.
   ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_