Fix nits in AssistiveSuggester.

A bunch of nits were raised in https://crrev.com/c/2049013 post-commit,
so making another change to fix them.

Test: tested with Linux emulator.
Bug: 1042084
Change-Id: I44d5835c21658e475dbba33c49a92c4b2e40d816
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109573
Commit-Queue: Jing Wang <jiwan@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751905}

chrome/browser/chromeos/BUILD.gn

@@ -179,7 +179,7 @@ source_set("chromeos") {
     "//components/arc",
     "//components/arc/media_session",
     "//components/arc/mojom:mojom_traits",
-    "//components/autofill/core/browser:browser",
+    "//components/autofill/core/browser",
     "//components/browser_sync",
     "//components/captive_portal/core",
     "//components/component_updater:crl_set_remover",

chrome/browser/chromeos/input_method/assistive_suggester.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2019 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.
 
@@ -65,10 +65,10 @@ AssistiveType ProposeAssistiveAction(const std::string& text) {
 
 AssistiveSuggester::AssistiveSuggester(InputMethodEngine* engine,
                                        Profile* profile)
-    : engine_(engine), profile_(profile) {
-  personal_data_manager_ =
-      autofill::PersonalDataManagerFactory::GetForProfile(profile_);
-}
+    : engine_(engine),
+      profile_(profile),
+      personal_data_manager_(
+          autofill::PersonalDataManagerFactory::GetForProfile(profile)) {}
 
 void AssistiveSuggester::OnFocus(int context_id) {
   context_id_ = context_id;
@@ -94,10 +94,9 @@ bool AssistiveSuggester::OnKeyEvent(
     if (event.key == "Tab" || event.key == "Right") {
       engine_->ConfirmCompositionText(false, false);
       return true;
-    } else {
-      DismissSuggestion();
-      suggestion_dismissed_ = true;
     }
+    DismissSuggestion();
+    suggestion_dismissed_ = true;
   }
 
   return false;
@@ -126,15 +125,10 @@ bool AssistiveSuggester::OnSurroundingTextChanged(const std::string& text,
     return false;
   }
 
-  if (context_id_ == -1)
+  if (context_id_ == -1 || suggestion_shown_)
     return false;
-
-  bool surrounding_text_changed = false;
-  if (!suggestion_shown_) {
-    Suggest(text, cursor_pos, anchor_pos);
-    surrounding_text_changed = suggestion_shown_;
-  }
-  return surrounding_text_changed;
+  Suggest(text, cursor_pos, anchor_pos);
+  return suggestion_shown_;
 }
 
 void AssistiveSuggester::Suggest(const std::string& text,
@@ -164,36 +158,34 @@ std::string AssistiveSuggester::GetPersonalInfoSuggestion(
   if (action == AssistiveType::kGenericAction)
     return "";
 
-  if (action == AssistiveType::kPersonalEmail) {
-    std::string email = profile_->GetProfileUserName();
-    return email;
-  } else {
-    auto autofill_profiles = personal_data_manager_->GetProfilesToSuggest();
-    if (autofill_profiles.size() > 0) {
-      // Currently, we are just picking the first candidate, will improve the
-      // strategy in the future.
-      auto* data = autofill_profiles[0];
-      base::string16 suggestion;
-      switch (action) {
-        case AssistiveType::kPersonalName:
-          suggestion = data->GetRawInfo(autofill::ServerFieldType::NAME_FULL);
-          break;
-        case AssistiveType::kPersonalAddress:
-          suggestion = data->GetRawInfo(
-              autofill::ServerFieldType::ADDRESS_HOME_STREET_ADDRESS);
-          break;
-        case AssistiveType::kPersonalPhoneNumber:
-          suggestion = data->GetRawInfo(
-              autofill::ServerFieldType::PHONE_HOME_WHOLE_NUMBER);
-          break;
-        default:
-          NOTREACHED();
-          break;
-      }
-      return base::UTF16ToUTF8(suggestion);
-    }
+  if (action == AssistiveType::kPersonalEmail)
+    return profile_->GetProfileUserName();
+
+  auto autofill_profiles = personal_data_manager_->GetProfilesToSuggest();
+  if (autofill_profiles.empty())
+    return "";
+
+  // Currently, we are just picking the first candidate, will improve the
+  // strategy in the future.
+  auto* data = autofill_profiles[0];
+  base::string16 suggestion;
+  switch (action) {
+    case AssistiveType::kPersonalName:
+      suggestion = data->GetRawInfo(autofill::ServerFieldType::NAME_FULL);
+      break;
+    case AssistiveType::kPersonalAddress:
+      suggestion = data->GetRawInfo(
+          autofill::ServerFieldType::ADDRESS_HOME_STREET_ADDRESS);
+      break;
+    case AssistiveType::kPersonalPhoneNumber:
+      suggestion =
+          data->GetRawInfo(autofill::ServerFieldType::PHONE_HOME_WHOLE_NUMBER);
+      break;
+    default:
+      NOTREACHED();
+      break;
   }
-  return "";
+  return base::UTF16ToUTF8(suggestion);
 }
 
 void AssistiveSuggester::ShowSuggestion(const std::string& text) {

chrome/browser/chromeos/input_method/assistive_suggester.h

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2019 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.
 
@@ -59,16 +59,16 @@ class AssistiveSuggester {
   void ShowSuggestion(const std::string& text);
   void DismissSuggestion();
 
-  InputMethodEngine* engine_;
+  InputMethodEngine* const engine_;
 
   // ID of the focused text field, 0 if none is focused.
   int context_id_ = -1;
 
   // User's Chrome user profile.
-  Profile* profile_;
+  Profile* const profile_;
 
   // Personal data manager provided by autofill service.
-  autofill::PersonalDataManager* personal_data_manager_;
+  autofill::PersonalDataManager* const personal_data_manager_;
 
   // If we are showing a suggestion right now.
   bool suggestion_shown_ = false;

chrome/browser/chromeos/input_method/native_input_method_engine.cc

@@ -205,8 +205,9 @@ void NativeInputMethodEngine::ImeObserver::OnSurroundingTextChanged(
     // If |assistive_suggester_| changes the surrounding text, no longer need
     // to call the following function, as the information is out-dated.
     if (assistive_suggester_->OnSurroundingTextChanged(text, cursor_pos,
-                                                       anchor_pos))
+                                                       anchor_pos)) {
       return;
+    }
   }
   base_observer_->OnSurroundingTextChanged(engine_id, text, cursor_pos,
                                            anchor_pos, offset_pos);

chrome/browser/chromeos/input_method/native_input_method_engine.h

@@ -48,9 +48,8 @@ class NativeInputMethodEngine : public InputMethodEngine {
    public:
     // |base_observer| is to forward events to extension during this migration.
     // It will be removed when the official extension is completely migrated.
-    explicit ImeObserver(
-        std::unique_ptr<InputMethodEngineBase::Observer> base_observer,
-        std::unique_ptr<AssistiveSuggester> assistive_suggester);
+    ImeObserver(std::unique_ptr<InputMethodEngineBase::Observer> base_observer,
+                std::unique_ptr<AssistiveSuggester> assistive_suggester);
     ~ImeObserver() override;
 
     // InputMethodEngineBase::Observer: