diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 07:06:18 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 07:06:18 +0000 |
| commit | fab55e79fa25eb384f4698850a0c7c9fdd7352a7 (patch) | |
| tree | e310ae687cab547cfff9bc050c28acd082bdadc2 /chrome/browser/prefs | |
| parent | 2130a837fc486c170bc5ea2b214a25260232336d (diff) | |
| download | chromium_src-fab55e79fa25eb384f4698850a0c7c9fdd7352a7.zip chromium_src-fab55e79fa25eb384f4698850a0c7c9fdd7352a7.tar.gz chromium_src-fab55e79fa25eb384f4698850a0c7c9fdd7352a7.tar.bz2 | |
reland of 'split webkit/glue/webpreferences to common and renderer'
Reland of https://codereview.chromium.org/16216007 with merge fixed.
TBR=jamesr@chromium.org
BUG=239107
Review URL: https://chromiumcodereview.appspot.com/15788004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/chrome_pref_service_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc index ffe54f7..f6a24a8 100644 --- a/chrome/browser/prefs/chrome_pref_service_unittest.cc +++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc @@ -26,7 +26,7 @@ #include "content/public/test/test_browser_thread.h" #include "content/public/test/web_contents_tester.h" #include "ui/base/test/data/resource.h" -#include "webkit/glue/webpreferences.h" +#include "webkit/common/webpreferences.h" using content::BrowserThread; using content::WebContentsTester; |