In components/autofill, move renderer/ to content/renderer

This change is part of moving components/autofill into its eventual structure
as a layered component. This CL additionally adds a README in
components/autofill that explains the project of making autofill into a layered
component.

TBR=thakis
BUG=247015

Review URL: https://chromiumcodereview.appspot.com/15949025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204642 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 95 insertions, 74 deletions

diff --git a/components/autofill.gypi b/components/autofill.gypi
index 684543b..f27ef0e 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -267,7 +267,7 @@
         },
 
         {
-          'target_name': 'autofill_renderer',
+          'target_name': 'autofill_content_renderer',
           'type': 'static_library',
           'include_dirs': [
             '..',
@@ -283,19 +283,19 @@
             'component_resources.gyp:component_resources',
           ],
           'sources': [
-            'autofill/renderer/autofill_agent.cc',
-            'autofill/renderer/autofill_agent.h',
-            'autofill/renderer/form_autofill_util.cc',
-            'autofill/renderer/form_autofill_util.h',
-            'autofill/renderer/form_cache.cc',
-            'autofill/renderer/form_cache.h',
-            'autofill/renderer/page_click_listener.h',
-            'autofill/renderer/page_click_tracker.cc',
-            'autofill/renderer/page_click_tracker.h',
-            'autofill/renderer/password_autofill_agent.cc',
-            'autofill/renderer/password_autofill_agent.h',
-            'autofill/renderer/password_generation_manager.cc',
-            'autofill/renderer/password_generation_manager.h',
+            'autofill/content/renderer/autofill_agent.cc',
+            'autofill/content/renderer/autofill_agent.h',
+            'autofill/content/renderer/form_autofill_util.cc',
+            'autofill/content/renderer/form_autofill_util.h',
+            'autofill/content/renderer/form_cache.cc',
+            'autofill/content/renderer/form_cache.h',
+            'autofill/content/renderer/page_click_listener.h',
+            'autofill/content/renderer/page_click_tracker.cc',
+            'autofill/content/renderer/page_click_tracker.h',
+            'autofill/content/renderer/password_autofill_agent.cc',
+            'autofill/content/renderer/password_autofill_agent.h',
+            'autofill/content/renderer/password_generation_manager.cc',
+            'autofill/content/renderer/password_generation_manager.h',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
diff --git a/components/autofill/README b/components/autofill/README
new file mode 100644
index 0000000..e7c00d4
--- /dev/null
+++ b/components/autofill/README
@@ -0,0 +1,21 @@
+Autofill is in the process of becoming a layered component
+(https://sites.google.com/a/chromium.org/dev/developers/design-documents/layered-components-design)
+to enable it to be shared cleanly on iOS. 
+
+When this process is complete, this component will have the following structure:
+
+- Top-level shared code that does not depend on src/content/ or src/ios/
+- content/: Driver for the shared code based on the content layer.
+  - browser/: Browser process code.
+  - renderer/: Renderer process code.
+  - common/: Code shared by the browser and the renderer.
+- ios/: Driver for the shared code based on src/ios.
+
+See
+https://sites.google.com/a/chromium.org/dev/developers/design-documents/layered-components-technical-approach/making-autofill-into-a-layered-component
+for an outline of the project.
+
+For pointers on how to continue getting your work done as the component moves
+into its new structure, see
+https://sites.google.com/a/chromium.org/dev/developers/design-documents/layered-components-technical-approach/making-autofill-into-a-layered-component#TOC-Help-How-Do-I-Get-My-Autofill-Related-Work-Done-
+
diff --git a/components/autofill/renderer/DEPS b/components/autofill/content/renderer/DEPS
index dbd28cf..dbd28cf 100644
--- a/components/autofill/renderer/DEPS
+++ b/components/autofill/content/renderer/DEPS
diff --git a/components/autofill/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index e8cc97a..be2046d 100644
--- a/components/autofill/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "components/autofill/renderer/autofill_agent.h"
+#include "components/autofill/content/renderer/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -19,15 +19,13 @@
 #include "components/autofill/common/form_data_predictions.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/web_element_descriptor.h"
-#include "components/autofill/renderer/form_autofill_util.h"
-#include "components/autofill/renderer/page_click_tracker.h"
-#include "components/autofill/renderer/password_autofill_agent.h"
+#include "components/autofill/content/renderer/form_autofill_util.h"
+#include "components/autofill/content/renderer/page_click_tracker.h"
+#include "components/autofill/content/renderer/password_autofill_agent.h"
 #include "content/public/common/password_form.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/component_resources.h"
-#include "third_party/WebKit/public/platform/WebRect.h"
-#include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
@@ -38,6 +36,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeCollection.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebOptionElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebRect.h"
+#include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/components/autofill/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
index 3303b60..8ca9e08 100644
--- a/components/autofill/renderer/autofill_agent.h
+++ b/components/autofill/content/renderer/autofill_agent.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 COMPONENTS_AUTOFILL_RENDERER_AUTOFILL_AGENT_H_
-#define COMPONENTS_AUTOFILL_RENDERER_AUTOFILL_AGENT_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
+#define COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
 
 #include <vector>
 
@@ -14,8 +14,8 @@
 #include "base/time.h"
 #include "base/timer.h"
 #include "components/autofill/common/forms_seen_state.h"
-#include "components/autofill/renderer/form_cache.h"
-#include "components/autofill/renderer/page_click_listener.h"
+#include "components/autofill/content/renderer/form_cache.h"
+#include "components/autofill/content/renderer/page_click_listener.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
@@ -292,4 +292,4 @@ class AutofillAgent : public content::RenderViewObserver,
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_RENDERER_AUTOFILL_AGENT_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
diff --git a/components/autofill/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc
index 04fc849..40a20e1 100644
--- a/components/autofill/renderer/form_autofill_util.cc
+++ b/components/autofill/content/renderer/form_autofill_util.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "components/autofill/renderer/form_autofill_util.h"
+#include "components/autofill/content/renderer/form_autofill_util.h"
 
 #include <map>
 
@@ -16,8 +16,6 @@
 #include "components/autofill/common/form_data.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/web_element_descriptor.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h"
@@ -30,6 +28,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebOptionElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/platform/WebVector.h"
 
 using WebKit::WebDocument;
 using WebKit::WebElement;
diff --git a/components/autofill/renderer/form_autofill_util.h b/components/autofill/content/renderer/form_autofill_util.h
index dfc80cd..cd65338 100644
--- a/components/autofill/renderer/form_autofill_util.h
+++ b/components/autofill/content/renderer/form_autofill_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 COMPONENTS_AUTOFILL_RENDERER_FORM_AUTOFILL_UTIL_H_
-#define COMPONENTS_AUTOFILL_RENDERER_FORM_AUTOFILL_UTIL_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_AUTOFILL_UTIL_H_
+#define COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_AUTOFILL_UTIL_H_
 
 #include <vector>
 
@@ -136,4 +136,4 @@ bool FormWithElementIsAutofilled(const WebKit::WebInputElement& element);
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_RENDERER_FORM_AUTOFILL_UTIL_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_AUTOFILL_UTIL_H_
diff --git a/components/autofill/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc
index 1c00d67..f43413c 100644
--- a/components/autofill/renderer/form_cache.cc
+++ b/components/autofill/content/renderer/form_cache.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "components/autofill/renderer/form_cache.h"
+#include "components/autofill/content/renderer/form_cache.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ -11,16 +11,16 @@
 #include "components/autofill/common/form_data_predictions.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/form_field_data_predictions.h"
-#include "components/autofill/renderer/form_autofill_util.h"
+#include "components/autofill/content/renderer/form_autofill_util.h"
 #include "grit/component_resources.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/platform/WebVector.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using WebKit::WebDocument;
diff --git a/components/autofill/renderer/form_cache.h b/components/autofill/content/renderer/form_cache.h
index b1ec311..6d3294e 100644
--- a/components/autofill/renderer/form_cache.h
+++ b/components/autofill/content/renderer/form_cache.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 COMPONENTS_AUTOFILL_RENDERER_FORM_CACHE_H_
-#define COMPONENTS_AUTOFILL_RENDERER_FORM_CACHE_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_CACHE_H_
+#define COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_CACHE_H_
 
 #include <map>
 #include <set>
@@ -74,4 +74,4 @@ class FormCache {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_RENDERER_FORM_CACHE_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_CACHE_H_
diff --git a/components/autofill/renderer/page_click_listener.h b/components/autofill/content/renderer/page_click_listener.h
index 7101722..a7490a0 100644
--- a/components/autofill/renderer/page_click_listener.h
+++ b/components/autofill/content/renderer/page_click_listener.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 COMPONENTS_AUTOFILL_RENDERER_PAGE_CLICK_LISTENER_H_
-#define COMPONENTS_AUTOFILL_RENDERER_PAGE_CLICK_LISTENER_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_PAGE_CLICK_LISTENER_H_
+#define COMPONENTS_AUTOFILL_CONTENT_RENDERER_PAGE_CLICK_LISTENER_H_
 
 namespace WebKit {
 class WebInputElement;
@@ -33,4 +33,4 @@ class PageClickListener {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_RENDERER_PAGE_CLICK_LISTENER_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PAGE_CLICK_LISTENER_H_
diff --git a/components/autofill/renderer/page_click_tracker.cc b/components/autofill/content/renderer/page_click_tracker.cc
index f1aae33..3e6ff3b 100644
--- a/components/autofill/renderer/page_click_tracker.cc
+++ b/components/autofill/content/renderer/page_click_tracker.cc
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "components/autofill/renderer/page_click_tracker.h"
+#include "components/autofill/content/renderer/page_click_tracker.h"
 
-#include "components/autofill/renderer/form_autofill_util.h"
-#include "components/autofill/renderer/page_click_listener.h"
+#include "components/autofill/content/renderer/form_autofill_util.h"
+#include "components/autofill/content/renderer/page_click_listener.h"
 #include "content/public/renderer/render_view.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMouseEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 
 using WebKit::WebDOMEvent;
 using WebKit::WebDOMMouseEvent;
diff --git a/components/autofill/renderer/page_click_tracker.h b/components/autofill/content/renderer/page_click_tracker.h
index 009ce9b..c812e77 100644
--- a/components/autofill/renderer/page_click_tracker.h
+++ b/components/autofill/content/renderer/page_click_tracker.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 COMPONENTS_AUTOFILL_RENDERER_PAGE_CLICK_TRACKER_H_
-#define COMPONENTS_AUTOFILL_RENDERER_PAGE_CLICK_TRACKER_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_PAGE_CLICK_TRACKER_H_
+#define COMPONENTS_AUTOFILL_CONTENT_RENDERER_PAGE_CLICK_TRACKER_H_
 
 #include <vector>
 
@@ -68,4 +68,4 @@ class PageClickTracker : public content::RenderViewObserver,
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_RENDERER_PAGE_CLICK_TRACKER_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PAGE_CLICK_TRACKER_H_
diff --git a/components/autofill/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
index 7ff58b1..551afd9 100644
--- a/components/autofill/renderer/password_autofill_agent.cc
+++ b/components/autofill/content/renderer/password_autofill_agent.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "components/autofill/renderer/password_autofill_agent.h"
+#include "components/autofill/content/renderer/password_autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ -11,11 +11,10 @@
 #include "components/autofill/common/autofill_messages.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/password_form_fill_data.h"
-#include "components/autofill/renderer/form_autofill_util.h"
+#include "components/autofill/content/renderer/form_autofill_util.h"
 #include "content/public/common/password_form.h"
 #include "content/public/renderer/password_form_conversion_utils.h"
 #include "content/public/renderer/render_view.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
@@ -24,6 +23,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebVector.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 namespace autofill {
diff --git a/components/autofill/renderer/password_autofill_agent.h b/components/autofill/content/renderer/password_autofill_agent.h
index 62354f9..6f748c9 100644
--- a/components/autofill/renderer/password_autofill_agent.h
+++ b/components/autofill/content/renderer/password_autofill_agent.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 COMPONENTS_AUTOFILL_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
-#define COMPONENTS_AUTOFILL_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
+#define COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 
 #include <map>
 #include <vector>
@@ -136,4 +136,4 @@ class PasswordAutofillAgent : public content::RenderViewObserver {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
diff --git a/components/autofill/renderer/password_generation_manager.cc b/components/autofill/content/renderer/password_generation_manager.cc
index 7ba2cde..7955917 100644
--- a/components/autofill/renderer/password_generation_manager.cc
+++ b/components/autofill/content/renderer/password_generation_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "components/autofill/renderer/password_generation_manager.h"
+#include "components/autofill/content/renderer/password_generation_manager.h"
 
 #include "base/logging.h"
 #include "components/autofill/common/autofill_messages.h"
@@ -10,15 +10,15 @@
 #include "content/public/renderer/password_form_conversion_utils.h"
 #include "content/public/renderer/render_view.h"
 #include "google_apis/gaia/gaia_urls.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
-#include "third_party/WebKit/public/platform/WebRect.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebCString.h"
+#include "third_party/WebKit/public/platform/WebRect.h"
+#include "third_party/WebKit/public/platform/WebVector.h"
 #include "ui/gfx/rect.h"
 
 namespace autofill {
diff --git a/components/autofill/renderer/password_generation_manager.h b/components/autofill/content/renderer/password_generation_manager.h
index 46510d1..2a2b71a 100644
--- a/components/autofill/renderer/password_generation_manager.h
+++ b/components/autofill/content/renderer/password_generation_manager.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 COMPONENTS_AUTOFILL_RENDERER_PASSWORD_GENERATION_MANAGER_H_
-#define COMPONENTS_AUTOFILL_RENDERER_PASSWORD_GENERATION_MANAGER_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_GENERATION_MANAGER_H_
+#define COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_GENERATION_MANAGER_H_
 
 #include <map>
 #include <utility>
@@ -87,4 +87,4 @@ class PasswordGenerationManager : public content::RenderViewObserver,
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_RENDERER_PASSWORD_GENERATION_MANAGER_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_GENERATION_MANAGER_H_