Misc. protector cleanup:

Misc. protector cleanup:

* Use GetSearchProviderHistogramID() more instead of hardcoding the expected histogram ID, for future-proofing against changing how we histogram these, as well as clarity
* No else after return

BUG=none
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=126962

[Ivan Korotkov, 2012-03-15 09:30:55]

Test changes LGTM but why the style changes in DefaultSearchProviderChange? Is
there some overall style cleanup going on?

[Peter Kasting, 2012-03-15 18:44:31]

On 2012/03/15 09:30:55, Ivan Korotkov wrote:
> Test changes LGTM but why the style changes in DefaultSearchProviderChange? Is
> there some overall style cleanup going on?

return after else is against team style -- Darin and I have been calling it out
for years, although I discovered the team style guide didn't actually cover it,
so I added it.

As to "why now" -- I was touching these files anyway while refactoring
TemplateURL and wanted to land the cleanup bits separately to keep the diffs
smaller.

[Ivan Korotkov, 2012-03-15 19:06:42]

I see, still lgtm then.
By "team style" you mean Chrome style in general?

[Peter Kasting, 2012-03-15 19:09:19]

On 2012/03/15 19:06:42, Ivan Korotkov wrote:
> I see, still lgtm then.
> By "team style" you mean Chrome style in general?

Yes, Chromium style.