[iOS][MF] Standardize to 'Manual Fill'

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I7605dd087b272397bfc028fd7c2de735033d4ea3
Reviewed-on: https://chromium-review.googlesource.com/1141954
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577261}

ios/chrome/browser/autofill/manualfill/BUILD.gn → ios/chrome/browser/autofill/manual_fill/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//ios/web/js_compile.gni")
 
-source_set("manualfill") {
+source_set("manual_fill") {
   sources = [
     "accessory_provider.h",
     "accessory_provider.mm",
@@ -12,7 +12,7 @@ source_set("manualfill") {
   deps = [
     "//base",
     "//ios/chrome/browser/autofill",
-    "//ios/chrome/browser/ui/autofill/manualfill",
+    "//ios/chrome/browser/ui/autofill/manual_fill",
   ]
   libs = [ "UIKit.framework" ]
   configs += [ "//build/config/compiler:enable_arc" ]

ios/chrome/browser/autofill/manualfill/accessory_provider.h → ios/chrome/browser/autofill/manual_fill/accessory_provider.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_ACCESSORY_PROVIDER_H_
-#define IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_ACCESSORY_PROVIDER_H_
+#ifndef IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_ACCESSORY_PROVIDER_H_
+#define IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_ACCESSORY_PROVIDER_H_
 
 #import "ios/chrome/browser/autofill/form_input_accessory_view_provider.h"
 
 // Returns a default keyboard accessory view with entry points to manual
 // fallbacks for form filling.
-@interface ManualfillAccessoryProvider
+@interface ManualFillAccessoryProvider
     : NSObject<FormInputAccessoryViewProvider>
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_ACCESSORY_PROVIDER_H_
+#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_ACCESSORY_PROVIDER_H_

ios/chrome/browser/autofill/manualfill/accessory_provider.mm → ios/chrome/browser/autofill/manual_fill/accessory_provider.mm

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/autofill/manualfill_accessory_provider.h"
+#import "ios/chrome/browser/autofill/manual_fill_accessory_provider.h"
 
 #include "base/feature_list.h"
 #import "base/mac/foundation_util.h"
 #include "components/autofill/core/common/autofill_features.h"
-#import "ios/chrome/browser/ui/autofill/manualfill/keyboard_accessory_view.h"
+#import "ios/chrome/browser/ui/autofill/manual_fill/keyboard_accessory_view.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-@interface ManualfillAccessoryProvider ()
+@interface ManualFillAccessoryProvider ()
 
 // The default accesory view to return in the update block.
 @property(nonatomic, readonly) KeyboardAccessoryView* accessoryView;
@@ -24,7 +24,7 @@
 
 @end
 
-@implementation ManualfillAccessoryProvider
+@implementation ManualFillAccessoryProvider
 
 @synthesize accessoryViewDelegate = _accessoryViewDelegate;
 @synthesize accessoryView = _accessoryView;
@@ -37,9 +37,9 @@
             accessoryViewUpdateBlock:
                 (AccessoryViewReadyCompletion)accessoryViewUpdateBlock {
   DCHECK(accessoryViewUpdateBlock);
-  BOOL isManualfillEnabled =
+  BOOL isManualFillEnabled =
       base::FeatureList::IsEnabled(autofill::features::kAutofillManualFallback);
-  if (!isManualfillEnabled) {
+  if (!isManualFillEnabled) {
     accessoryViewUpdateBlock(nil, self);
     return;
   }

ios/chrome/browser/autofill/manualfill/input_assistant_manualfill_view_controller.h → ios/chrome/browser/autofill/manual_fill/input_assistant_manual_fill_view_controller.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_INPUT_ASSISTANT_MANUALFILL_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_INPUT_ASSISTANT_MANUALFILL_VIEW_CONTROLLER_H_
+#ifndef IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_INPUT_ASSISTANT_MANUAL_FILL_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_INPUT_ASSISTANT_MANUAL_FILL_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/autofill/manualfill/manualfill_view_controller.h"
+#import "ios/chrome/browser/autofill/manual_fill/manual_fill_view_controller.h"
 
 // This class allows the user to manual fill data by adding input assistant
 // items  to the first responder. Which then uses pop overs to show the
 // available options. Currently the `inputAssistantItem` property is only
 // available on iPads.
-@interface InputAssistantManualfillViewController : ManualfillViewController
+@interface InputAssistantManualFillViewController : ManualFillViewController
 @end
 
-#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_INPUT_ASSISTANT_MANUALFILL_VIEW_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_INPUT_ASSISTANT_MANUAL_FILL_VIEW_CONTROLLER_H_

ios/chrome/browser/autofill/manualfill/input_assistant_manualfill_view_controller.mm → ios/chrome/browser/autofill/manual_fill/input_assistant_manual_fill_view_controller.mm

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/autofill/manualfill/input_assistant_manualfill_view_controller.h"
+#import "ios/chrome/browser/autofill/manual_fill/input_assistant_manual_fill_view_controller.h"
 
 #import <WebKit/WebKit.h>
 
-#import "ios/chrome/browser/autofill/manualfill/password_picker_view_controller.h"
+#import "ios/chrome/browser/autofill/manual_fill/password_picker_view_controller.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -102,7 +102,7 @@
           representativeItem:itemChoose];
 
   UITextInputAssistantItem* item =
-      [manualfill::GetFirstResponderSubview(self.view) inputAssistantItem];
+      [manual_fill::GetFirstResponderSubview(self.view) inputAssistantItem];
   item.leadingBarButtonGroups = @[ group ];
 }
 
@@ -111,7 +111,7 @@
 // @param sender The item requesting the pop over, used for positioning.
 - (void)presentPopOverForSender:(UIBarButtonItem*)sender {
   [self updateActiveFieldID];
-  self.lastFirstResponder = manualfill::GetFirstResponderSubview(self.view);
+  self.lastFirstResponder = manual_fill::GetFirstResponderSubview(self.view);
 
   // TODO:(javierrobles) Test this on iOS 10.
   // TODO:(javierrobles) Support / dismiss on rotation.

ios/chrome/browser/autofill/manual_fill/keyboard_view_controller.h

+// Copyright 2018 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 IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_KEYBOARD_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_KEYBOARD_VIEW_CONTROLLER_H_
+
+#import "ios/chrome/browser/autofill/manual_fill/manual_fill_view_controller.h"
+
+#import "ios/chrome/browser/ui/autofill/manual_fill/keyboard_accessory_view.h"
+
+// Subclass of `ManualFillViewController` with the code that is specific for
+// devices with no undocked keyboard.
+@interface ManualFillKeyboardViewController
+    : ManualFillViewController<KeyboardAccessoryViewDelegate>
+@end
+
+#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_KEYBOARD_VIEW_CONTROLLER_H_

ios/chrome/browser/autofill/manualfill/manualfill_keyboard_view_controller.mm → ios/chrome/browser/autofill/manual_fill/keyboard_view_controller.mm

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/autofill/manualfill/manualfill_keyboard_view_controller.h"
+#import "ios/chrome/browser/autofill/manual_fill/keyboard_view_controller.h"
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/autofill/manualfill/password_picker_view_controller.h"
-#import "ios/chrome/browser/ui/autofill/manualfill/keyboard_background_view.h"
+#import "ios/chrome/browser/autofill/manual_fill/password_picker_view_controller.h"
+#import "ios/chrome/browser/ui/autofill/manual_fill/keyboard_background_view.h"
 #import "ios/chrome/common/ui_util/constraints_ui_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -23,7 +23,7 @@ namespace {
 //         found.
 UIView* GetKeyboardAccessoryView() {
   for (UIWindow* window in [[UIApplication sharedApplication] windows]) {
-    UIView* firstResponder = manualfill::GetFirstResponderSubview(window);
+    UIView* firstResponder = manual_fill::GetFirstResponderSubview(window);
     if (firstResponder) {
       return firstResponder.inputAccessoryView;
     }
@@ -33,7 +33,7 @@ UIView* GetKeyboardAccessoryView() {
 
 }  // namespace
 
-@interface ManualfillKeyboardViewController ()
+@interface ManualFillKeyboardViewController ()
 
 // A strong reference to `inputAccessoryView` used in this class to jump
 // between the web view fields.
@@ -66,7 +66,7 @@ UIView* GetKeyboardAccessoryView() {
 
 @end
 
-@implementation ManualfillKeyboardViewController
+@implementation ManualFillKeyboardViewController
 @synthesize lastAccessoryInputView = _lastAccessoryInputView;
 @synthesize shouldShowManualFillView = _shouldShowManualFillView;
 @synthesize manualFillView = _manualFillView;
@@ -152,7 +152,7 @@ UIView* GetKeyboardAccessoryView() {
 
 - (void)handleKeyboardDidShowNotification:(NSNotification*)notification {
   // Update the first responder and it's accessory view.
-  self.lastFirstResponder = manualfill::GetFirstResponderSubview(self.view);
+  self.lastFirstResponder = manual_fill::GetFirstResponderSubview(self.view);
   // This is needed to keep a strong reference to the input accessory view.
   self.lastAccessoryInputView = self.lastFirstResponder.inputAccessoryView;
 

ios/chrome/browser/autofill/manualfill/manualfill_view_controller.h → ios/chrome/browser/autofill/manual_fill/manual_fill_view_controller.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_MANUALFILL_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_MANUALFILL_VIEW_CONTROLLER_H_
+#ifndef IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_MANUAL_FILL_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_MANUAL_FILL_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
 
-namespace manualfill {
+namespace manual_fill {
 
 // Searches for the first responder in the passed view hierarchy.
 //
@@ -16,7 +16,7 @@ namespace manualfill {
 // @return The first responder or `nil` if it wasn't found.
 UIView* GetFirstResponderSubview(UIView* view);
 
-}  // namespace manualfill
+}  // namespace manual_fill
 
 // Protocol to pass any user choice in a picker to be filled.
 @protocol ManualFillContentDelegate<NSObject>
@@ -31,7 +31,7 @@ UIView* GetFirstResponderSubview(UIView* view);
 
 // View Controller with the common logic for managing the manual fill views. As
 // well as sending user input to the web view. Meant to be subclassed.
-@interface ManualfillViewController
+@interface ManualFillViewController
     : UIViewController<ManualFillContentDelegate>
 
 // The web view to test the prototype.
@@ -54,4 +54,4 @@ UIView* GetFirstResponderSubview(UIView* view);
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_MANUALFILL_VIEW_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_MANUAL_FILL_VIEW_CONTROLLER_H_

ios/chrome/browser/autofill/manualfill/manualfill_view_controller.mm → ios/chrome/browser/autofill/manual_fill/manual_fill_view_controller.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/autofill/manualfill/manualfill_view_controller.h"
+#import "ios/chrome/browser/autofill/manual_fill/manual_fill_view_controller.h"
 
 #import <WebKit/WebKit.h>
 
@@ -12,7 +12,7 @@
 #error "This file requires ARC support."
 #endif
 
-namespace manualfill {
+namespace manual_fill {
 
 UIView* GetFirstResponderSubview(UIView* view) {
   if ([view isFirstResponder])
@@ -27,7 +27,7 @@ UIView* GetFirstResponderSubview(UIView* view) {
   return nil;
 }
 
-}  // namespace manualfill
+}  // namespace manual_fill
 
 @interface ManualfillViewController ()
 
@@ -71,7 +71,7 @@ UIView* GetFirstResponderSubview(UIView* view) {
 
 - (void)updateActiveFieldID {
   __weak __typeof(self) weakSelf = self;
-  NSString* javaScriptQuery = @"__gCrWeb.manualfill.activeElementId()";
+  NSString* javaScriptQuery = @"__gCrWeb.manualFill.activeElementId()";
   [self.webView evaluateJavaScript:javaScriptQuery
                  completionHandler:^(id result, NSError* error) {
                    NSLog(@"result: %@", [result description]);
@@ -83,7 +83,7 @@ UIView* GetFirstResponderSubview(UIView* view) {
 - (void)fillLastSelectedFieldWithString:(NSString*)string {
   NSString* javaScriptQuery =
       [NSString stringWithFormat:
-                    @"__gCrWeb.manualfill.setValueForElementId(\"%@\", \"%@\")",
+                    @"__gCrWeb.manualFill.setValueForElementId(\"%@\", \"%@\")",
                     string, self.activeFieldID];
   [self.webView evaluateJavaScript:javaScriptQuery completionHandler:nil];
 }
@@ -116,7 +116,7 @@ UIView* GetFirstResponderSubview(UIView* view) {
 - (NSString*)earlyJSStringMainFrame {
   NSArray* filenames = @[
     @"main_frame_web_bundle", @"chrome_bundle_main_frame",
-    @"manualfill_controller"
+    @"manual_fill_controller"
   ];
   return [self joinedJSFilesWithFilenames:filenames];
 }

ios/chrome/browser/autofill/manualfill/password_picker_view_controller.h → ios/chrome/browser/autofill/manual_fill/password_picker_view_controller.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_PASSWORD_PICKER_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_PASSWORD_PICKER_VIEW_CONTROLLER_H_
+#ifndef IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_PASSWORD_PICKER_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_PASSWORD_PICKER_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 
@@ -37,4 +37,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_PASSWORD_PICKER_VIEW_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUAL_FILL_PASSWORD_PICKER_VIEW_CONTROLLER_H_

ios/chrome/browser/autofill/manualfill/password_picker_view_controller.mm → ios/chrome/browser/autofill/manual_fill/password_picker_view_controller.mm

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/autofill/manualfill/password_picker_view_controller.h"
+#import "ios/chrome/browser/autofill/manual_fill/password_picker_view_controller.h"
 
-#import "ios/chrome/browser/autofill/manualfill/manualfill_view_controller.h"
+#import "ios/chrome/browser/autofill/manual_fill/manual_fill_view_controller.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/autofill/manualfill/resources/manualfill_controller.js → ios/chrome/browser/autofill/manual_fill/resources/manual_fill_controller.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-goog.provide('__crWeb.manualfill');
+goog.provide('__crWeb.manualFill');
 
 /* Beginning of anonymous object. */
 (function() {
@@ -11,15 +11,15 @@ goog.provide('__crWeb.manualfill');
  * Namespace for this file. It depends on |__gCrWeb| having already been
  * injected.
  */
-__gCrWeb.manualfill = {};
-__gCrWeb['manualfill'] = __gCrWeb.manualfill;
+__gCrWeb.manualFill = {};
+__gCrWeb['manualFill'] = __gCrWeb.manualFill;
 
 /**
  * Returns the identifier to be used with `setValueForElementId`.
  *
  * @return {string} The id of the active element.
  */
-__gCrWeb.manualfill.activeElementId = function() {
+__gCrWeb.manualFill.activeElementId = function() {
   var activeElementId = document.activeElement.id;
   return activeElementId;
 };
@@ -31,7 +31,7 @@ __gCrWeb.manualfill.activeElementId = function() {
  * @param {string} identifier The identifier of the element, found with
  *                 `activeElementId`.
  */
-__gCrWeb.manualfill.setValueForElementId = function(value, identifier) {
+__gCrWeb.manualFill.setValueForElementId = function(value, identifier) {
   if (!identifier) {
     return
   }

ios/chrome/browser/autofill/manualfill/manualfill_keyboard_view_controller.h

-// Copyright 2018 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 IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_MANUALFILL_KEYBOARD_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_MANUALFILL_KEYBOARD_VIEW_CONTROLLER_H_
-
-#import "ios/chrome/browser/autofill/manualfill/manualfill_view_controller.h"
-
-#import "ios/chrome/browser/ui/autofill/manualfill/keyboard_accessory_view.h"
-
-// Subclass of `ManualfillViewController` with the code that is specific for
-// devices with no undocked keyboard.
-@interface ManualfillKeyboardViewController
-    : ManualfillViewController<KeyboardAccessoryViewDelegate>
-@end
-
-#endif  // IOS_CHROME_BROWSER_AUTOFILL_MANUALFILL_MANUALFILL_KEYBOARD_VIEW_CONTROLLER_H_

ios/chrome/browser/ui/autofill/manualfill/BUILD.gn → ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//ios/web/js_compile.gni")
 
-source_set("manualfill") {
+source_set("manual_fill") {
   sources = [
     "keyboard_accessory_view.h",
     "keyboard_accessory_view.mm",

ios/chrome/browser/ui/autofill/manualfill/keyboard_accessory_view.h → ios/chrome/browser/ui/autofill/manual_fill/keyboard_accessory_view.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_AUTOFILL_MANUALFILL_KEYBOARD_ACCESSORY_VIEW_H_
-#define IOS_CHROME_BROWSER_UI_AUTOFILL_MANUALFILL_KEYBOARD_ACCESSORY_VIEW_H_
+#ifndef IOS_CHROME_BROWSER_UI_AUTOFILL_MANUAL_FILL_KEYBOARD_ACCESSORY_VIEW_H_
+#define IOS_CHROME_BROWSER_UI_AUTOFILL_MANUAL_FILL_KEYBOARD_ACCESSORY_VIEW_H_
 
 #import <UIKit/UIKit.h>
 
@@ -47,4 +47,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_AUTOFILL_MANUALFILL_KEYBOARD_ACCESSORY_VIEW_H_
+#endif  // IOS_CHROME_BROWSER_UI_AUTOFILL_MANUAL_FILL_KEYBOARD_ACCESSORY_VIEW_H_

ios/chrome/browser/ui/autofill/manualfill/keyboard_accessory_view.mm → ios/chrome/browser/ui/autofill/manual_fill/keyboard_accessory_view.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/autofill/manualfill/keyboard_accessory_view.h"
+#import "ios/chrome/browser/ui/autofill/manual_fill/keyboard_accessory_view.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/autofill/manualfill/keyboard_background_view.h → ios/chrome/browser/ui/autofill/manual_fill/keyboard_background_view.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_AUTOFILL_MANUALFILL_KEYBOARD_BACKGROUND_VIEW_H_
-#define IOS_CHROME_BROWSER_UI_AUTOFILL_MANUALFILL_KEYBOARD_BACKGROUND_VIEW_H_
+#ifndef IOS_CHROME_BROWSER_UI_AUTOFILL_MANUAL_FILL_KEYBOARD_BACKGROUND_VIEW_H_
+#define IOS_CHROME_BROWSER_UI_AUTOFILL_MANUAL_FILL_KEYBOARD_BACKGROUND_VIEW_H_
 
 #import <UIKit/UIKit.h>
 
@@ -39,4 +39,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_AUTOFILL_MANUALFILL_KEYBOARD_BACKGROUND_VIEW_H_
+#endif  // IOS_CHROME_BROWSER_UI_AUTOFILL_MANUAL_FILL_KEYBOARD_BACKGROUND_VIEW_H_

ios/chrome/browser/ui/autofill/manualfill/keyboard_background_view.mm → ios/chrome/browser/ui/autofill/manual_fill/keyboard_background_view.mm

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/autofill/manualfill/keyboard_background_view.h"
+#import "ios/chrome/browser/ui/autofill/manual_fill/keyboard_background_view.h"
 
-#import "ios/chrome/browser/ui/autofill/manualfill/keyboard_accessory_view.h"
+#import "ios/chrome/browser/ui/autofill/manual_fill/keyboard_accessory_view.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."