summaryrefslogtreecommitdiffstats
path: root/content/shell/common
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-30 23:32:29 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-30 23:32:29 +0000
commita0a81442d80fda67fab9108e9018b8750da115b6 (patch)
treebec38608be3ccfd2da6786375fe33a0347797ef4 /content/shell/common
parentd5f8440640aab5a07b1c98fe38e488e48362a6af (diff)
downloadchromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.zip
chromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.tar.gz
chromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.tar.bz2
Revert 203261 "split webkit/glue/webpreferences to common and re..."
Broke compile > split webkit/glue/webpreferences to common and renderer > > TBR=jamesr@chromium.org > > BUG=239107 > > Review URL: https://codereview.chromium.org/16216007 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/16232014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/common')
-rw-r--r--content/shell/common/webkit_test_helpers.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/shell/common/webkit_test_helpers.cc b/content/shell/common/webkit_test_helpers.cc
index 2417dc1..78f96c1 100644
--- a/content/shell/common/webkit_test_helpers.cc
+++ b/content/shell/common/webkit_test_helpers.cc
@@ -10,7 +10,7 @@
#include "base/utf_string_conversions.h"
#include "content/shell/common/shell_switches.h"
#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h"
-#include "webkit/common/webpreferences.h"
+#include "webkit/glue/webpreferences.h"
namespace content {