Revert 203261 "split webkit/glue/webpreferences to common and re..."

trunk/src/content/shell/webkit_test_controller.h

 // Copyright (c) 2012 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_WEBKIT_TEST_CONTROLLER_H_
 #define CONTENT_SHELL_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/render_view_host_observer.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/size.h"
-#include "webkit/common/webpreferences.h"
+#include "webkit/glue/webpreferences.h"
 
 class SkBitmap;
 
 namespace content {
 
 class Shell;
 
 class WebKitTestResultPrinter {
  public:
   WebKitTestResultPrinter(std::ostream* output, std::ostream* error);
@@ skipping 150 matching lines @@
   base::CancelableClosure watchdog_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_