[Instant] Update InstantController state to ensure valid subsequent queries

[Instant] Update InstantController state to ensure valid subsequent queries

|last_omnibox_text_| was not properly updated after two separate INSTANT_COMMIT_FOCUS_LOST events (clicking on the page and clicking on a suggestion). 

BUG=171393
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=179252

[Mathieu, 2013-01-24 22:34:08]

Hi sreeram, 

Can you take a look. It solves the issues mentioned in the bug. Thanks!

[sreeram, 2013-01-24 22:54:32]

https://codereview.chromium.org/12035083/diff/1/chrome/browser/instant/instan...
File chrome/browser/instant/instant_controller.cc (right):

https://codereview.chromium.org/12035083/diff/1/chrome/browser/instant/instan...
chrome/browser/instant/instant_controller.cc:554: last_omnibox_text_ =
ASCIIToUTF16(query);
You only need to do this if we hit the "if" condition on line 545. Otherwise,
you're merely converting from last_omnibox_text_ -> query -> last_omnibox_text_.
So just put this along with line 546.

https://codereview.chromium.org/12035083/diff/1/chrome/browser/instant/instan...
chrome/browser/instant/instant_controller.cc:751: last_omnibox_text_ =
suggestion.text;
Put this above the call to browser_->SetInstantSuggestion(). Also reset
last_suggestion_ and set last_match_was_search_. Basically, the same code as in
lines 764 to 769 below.

[Mathieu, 2013-01-28 18:50:32]

Thanks!

https://codereview.chromium.org/12035083/diff/1/chrome/browser/instant/instan...
File chrome/browser/instant/instant_controller.cc (right):

https://codereview.chromium.org/12035083/diff/1/chrome/browser/instant/instan...
chrome/browser/instant/instant_controller.cc:554: last_omnibox_text_ =
ASCIIToUTF16(query);
On 2013/01/24 22:54:32, sreeram wrote:
> You only need to do this if we hit the "if" condition on line 545. Otherwise,
> you're merely converting from last_omnibox_text_ -> query ->
last_omnibox_text_.
> So just put this along with line 546.

Done.

https://codereview.chromium.org/12035083/diff/1/chrome/browser/instant/instan...
chrome/browser/instant/instant_controller.cc:751: last_omnibox_text_ =
suggestion.text;
On 2013/01/24 22:54:32, sreeram wrote:
> Put this above the call to browser_->SetInstantSuggestion(). Also reset
> last_suggestion_ and set last_match_was_search_. Basically, the same code as
in
> lines 764 to 769 below.

Okay, copied the lines over there.

[sreeram, 2013-01-28 18:58:32]

lgtm

https://codereview.chromium.org/12035083/diff/4001/chrome/browser/instant/ins...
File chrome/browser/instant/instant_controller.cc (right):

https://codereview.chromium.org/12035083/diff/4001/chrome/browser/instant/ins...
chrome/browser/instant/instant_controller.cc:566: last_omnibox_text_ =
ASCIIToUTF16(query);
Nit: You could avoid the conversion by just doing:
last_omnibox_text_ += last_suggestion_.text;

[commit-bot: I haz the power, 2013-01-28 19:12:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mathp@chromium.org/12035083/9001

[commit-bot: I haz the power, 2013-01-28 22:13:53]

Retried try job too often on win_rel for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-01-28 22:59:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mathp@chromium.org/12035083/9001

[commit-bot: I haz the power, 2013-01-29 01:50:11]

Change committed as 179252