diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 17:03:03 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 17:03:03 +0000 |
| commit | feb7b45c4e7bf1b6d3b3f76209fa80e1a6403411 (patch) | |
| tree | d4b3b7ad23f884e108873f6c7e949eec45c3c8c9 /android_webview/browser | |
| parent | fa7602c91a1ddcff0bd5056ae88596dfd86ef0f0 (diff) | |
| download | chromium_src-feb7b45c4e7bf1b6d3b3f76209fa80e1a6403411.zip chromium_src-feb7b45c4e7bf1b6d3b3f76209fa80e1a6403411.tar.gz chromium_src-feb7b45c4e7bf1b6d3b3f76209fa80e1a6403411.tar.bz2 | |
Revert "In components/autofill, move common/ to shared/"
This reverts commit fe014d19c0bac2bb05701ddb0d32119fe4f17c9f.
This change broke compile on the win_split bot:
http://build.chromium.org/p/chromium/buildstatus?builder=Win%20Split&number=690
TBR=blundell
Review URL: https://codereview.chromium.org/17165002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
| -rw-r--r-- | android_webview/browser/DEPS | 2 | ||||
| -rw-r--r-- | android_webview/browser/aw_autofill_manager_delegate.cc | 2 | ||||
| -rw-r--r-- | android_webview/browser/aw_form_database_service_unittest.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS index 458b372..23d70e4 100644 --- a/android_webview/browser/DEPS +++ b/android_webview/browser/DEPS @@ -8,8 +8,8 @@ include_rules = [ "+components/auto_login_parser", "+components/autofill/browser", + "+components/autofill/common", "+components/autofill/content/browser", - "+components/autofill/shared", "+components/navigation_interception", "+components/user_prefs", "+components/visitedlink/browser", diff --git a/android_webview/browser/aw_autofill_manager_delegate.cc b/android_webview/browser/aw_autofill_manager_delegate.cc index c21b1a6..09ea866 100644 --- a/android_webview/browser/aw_autofill_manager_delegate.cc +++ b/android_webview/browser/aw_autofill_manager_delegate.cc @@ -11,8 +11,8 @@ #include "base/prefs/pref_service.h" #include "base/prefs/pref_service_builder.h" #include "components/autofill/browser/webdata/autofill_webdata_service.h" +#include "components/autofill/common/autofill_pref_names.h" #include "components/autofill/content/browser/autocheckout/whitelist_manager.h" -#include "components/autofill/shared/autofill_pref_names.h" #include "components/user_prefs/user_prefs.h" namespace { diff --git a/android_webview/browser/aw_form_database_service_unittest.cc b/android_webview/browser/aw_form_database_service_unittest.cc index 909a4ce..bae9be3 100644 --- a/android_webview/browser/aw_form_database_service_unittest.cc +++ b/android_webview/browser/aw_form_database_service_unittest.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "components/autofill/browser/webdata/autofill_webdata_service.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util_android.h" |