Merge to 2704 "[DevTools] Introduce a setting for console autocomplete from history."

third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

Index: third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
index 302287817a3a255d9172548ca4461eff65c2cfcf..12985579d09d7211e6b0f3e5e97e5b058ed9e078 100644
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
@@ -141,6 +141,10 @@ WebInspector.ConsoleView = function()
     var historyData = this._consoleHistorySetting.get();
     this._prompt.setHistoryData(historyData);
 
+    this._consoleHistoryAutocompleteSetting = WebInspector.moduleSetting("consoleHistoryAutocomplete");
+    this._consoleHistoryAutocompleteSetting.addChangeListener(this._consoleHistoryAutocompleteChanged, this);
+    this._consoleHistoryAutocompleteChanged();
+
     this._updateFilterStatus();
     WebInspector.moduleSetting("consoleTimestampsEnabled").addChangeListener(this._consoleTimestampsSettingChanged, this);
 
@@ -170,6 +174,11 @@ WebInspector.ConsoleView.prototype = {
         this._prompt.setHistoryData([]);
     },
 
+    _consoleHistoryAutocompleteChanged: function()
+    {
+        this._prompt.setAddCompletionsFromHistory(this._consoleHistoryAutocompleteSetting.get());
+    },
+
     /**
      * @param {!WebInspector.Event} event
      */