Refactoring after comments in https://codereview.chromium.org/2639153002

Refactoring after comments in https://codereview.chromium.org/2639153002

In one of comments in https://codereview.chromium.org/2639153002 we
decided to remove TemplateURLService::AddExtensionControlledTURL method
and replace it with TemplateURL constructor.

R=pkasting@chromium.org

Review-Url: https://codereview.chromium.org/2814743006
Cr-Commit-Position: refs/heads/master@{#465245}
Committed: https://chromium.googlesource.com/chromium/src/+/c134e76412a1d0ef7f64959f8ee1a5f550f67067

[Peter Kasting, 2017-04-13 00:11:01]

LGTM

https://codereview.chromium.org/2814743006/diff/1/chrome/browser/search_engin...
File chrome/browser/search_engines/template_url_service_test_util.cc (right):

https://codereview.chromium.org/2814743006/diff/1/chrome/browser/search_engin...
chrome/browser/search_engines/template_url_service_test_util.cc:163:
DCHECK(result->GetExtensionInfoForTesting());
This unconditionally derefs the pointer, but then we conditionally check it
below.  That doesn't make sense.

Either this should be DCHECK(!result || ...), or we should DCHECK(result) as
well and remove it from the conditional below.

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
File components/search_engines/template_url.cc (right):

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
components/search_engines/template_url.cc:1177: // Default engines are not
allowed for omnibox keywords.
Nit: "Omnibox keywords may not be set as default"?

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
components/search_engines/template_url.cc:1178:
DCHECK(!(wants_to_be_default_engine && type == OMNIBOX_API_EXTENSION));
Nit: Distribute ! through and eliminate parens

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
File components/search_engines/template_url_service.cc (right):

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
components/search_engines/template_url_service.cc:439: kInvalidTemplateURLID ==
template_url->id()));
Nit: Reverse comparison arms (prefer foo == 0 to 0 == foo); see
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md...

[Alexander Yashkin, 2017-04-13 06:02:26]

The CQ bit was checked by a-v-y@yandex-team.ru

[Alexander Yashkin, 2017-04-13 06:02:26]

The patchset sent to the CQ was uploaded after l-g-t-m from
pkasting@chromium.org
Link to the patchset: https://codereview.chromium.org/2814743006/#ps20001
(title: "Fixed after review, round 1")

[commit-bot: I haz the power, 2017-04-13 06:02:53]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Alexander Yashkin, 2017-04-13 06:07:50]

https://codereview.chromium.org/2814743006/diff/1/chrome/browser/search_engin...
File chrome/browser/search_engines/template_url_service_test_util.cc (right):

https://codereview.chromium.org/2814743006/diff/1/chrome/browser/search_engin...
chrome/browser/search_engines/template_url_service_test_util.cc:163:
DCHECK(result->GetExtensionInfoForTesting());
On 2017/04/13 at 00:11:01, Peter Kasting wrote:
> This unconditionally derefs the pointer, but then we conditionally check it
below.  That doesn't make sense.
> 
> Either this should be DCHECK(!result || ...), or we should DCHECK(result) as
well and remove it from the conditional below.

Added DCHECK(result)

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
File components/search_engines/template_url.cc (right):

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
components/search_engines/template_url.cc:1177: // Default engines are not
allowed for omnibox keywords.
On 2017/04/13 at 00:11:01, Peter Kasting wrote:
> Nit: "Omnibox keywords may not be set as default"?

Thanks, fixed.

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
components/search_engines/template_url.cc:1178:
DCHECK(!(wants_to_be_default_engine && type == OMNIBOX_API_EXTENSION));
On 2017/04/13 at 00:11:01, Peter Kasting wrote:
> Nit: Distribute ! through and eliminate parens

Done

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
File components/search_engines/template_url_service.cc (right):

https://codereview.chromium.org/2814743006/diff/1/components/search_engines/t...
components/search_engines/template_url_service.cc:439: kInvalidTemplateURLID ==
template_url->id()));
On 2017/04/13 at 00:11:01, Peter Kasting wrote:
> Nit: Reverse comparison arms (prefer foo == 0 to 0 == foo); see
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md...

Done

[commit-bot: I haz the power, 2017-04-13 06:11:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-04-13 06:11:13]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[Alexander Yashkin, 2017-04-13 06:12:23]

a-v-y@yandex-team.ru changed reviewers:
+ vasilii@chromium.org

[Alexander Yashkin, 2017-04-17 15:33:18]

On 2017/04/13 at 06:11:13, commit-bot wrote:
> Try jobs failed on following builders:
>   chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

PTAL vasilii

[vasilii, 2017-04-18 13:48:23]

lgtm

https://codereview.chromium.org/2814743006/diff/20001/chrome/browser/search_e...
File chrome/browser/search_engines/template_url_service_test_util.cc (right):

https://codereview.chromium.org/2814743006/diff/20001/chrome/browser/search_e...
chrome/browser/search_engines/template_url_service_test_util.cc:164:
DCHECK(result->GetExtensionInfoForTesting());
ASSERT_TRUE is more appropriate

https://codereview.chromium.org/2814743006/diff/20001/components/search_engin...
File components/search_engines/template_url.cc (right):

https://codereview.chromium.org/2814743006/diff/20001/components/search_engin...
components/search_engines/template_url.cc:1176: type == OMNIBOX_API_EXTENSION);
Add "<< type;"

[Alexander Yashkin, 2017-04-18 14:36:15]

https://codereview.chromium.org/2814743006/diff/20001/chrome/browser/search_e...
File chrome/browser/search_engines/template_url_service_test_util.cc (right):

https://codereview.chromium.org/2814743006/diff/20001/chrome/browser/search_e...
chrome/browser/search_engines/template_url_service_test_util.cc:164:
DCHECK(result->GetExtensionInfoForTesting());
On 2017/04/18 at 13:48:22, vasilii wrote:
> ASSERT_TRUE is more appropriate

Can not use it here.
https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuid...
"You can use assertions in any C++ function. In particular, it doesn't have to
be a method of the test fixture class. 
The one constraint is that assertions that generate a fatal failure (FAIL* and
ASSERT_*) can only be used in void-returning functions."

https://codereview.chromium.org/2814743006/diff/20001/components/search_engin...
File components/search_engines/template_url.cc (right):

https://codereview.chromium.org/2814743006/diff/20001/components/search_engin...
components/search_engines/template_url.cc:1176: type == OMNIBOX_API_EXTENSION);
On 2017/04/18 at 13:48:23, vasilii wrote:
> Add "<< type;"

Done

[Alexander Yashkin, 2017-04-18 14:36:19]

The CQ bit was checked by a-v-y@yandex-team.ru

[Alexander Yashkin, 2017-04-18 14:36:19]

The patchset sent to the CQ was uploaded after l-g-t-m from
vasilii@chromium.org, pkasting@chromium.org
Link to the patchset: https://codereview.chromium.org/2814743006/#ps40001
(title: "Fixed after review, round 2")

[commit-bot: I haz the power, 2017-04-18 14:36:40]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-04-18 15:31:34]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1492526179203440,
"parent_rev": "dc615d216b891170a55a2c14bf594c33866eb654", "commit_rev":
"c134e76412a1d0ef7f64959f8ee1a5f550f67067"}

[commit-bot: I haz the power, 2017-04-18 15:33:31]

Description was changed from

==========
Refactoring after comments in https://codereview.chromium.org/2639153002

In one of comments in https://codereview.chromium.org/2639153002 we
decided to remove TemplateURLService::AddExtensionControlledTURL method
and replace it with TemplateURL constructor.


R=pkasting@chromium.org
==========

to

==========
Refactoring after comments in https://codereview.chromium.org/2639153002

In one of comments in https://codereview.chromium.org/2639153002 we
decided to remove TemplateURLService::AddExtensionControlledTURL method
and replace it with TemplateURL constructor.

R=pkasting@chromium.org

Review-Url: https://codereview.chromium.org/2814743006
Cr-Commit-Position: refs/heads/master@{#465245}
Committed:
https://chromium.googlesource.com/chromium/src/+/c134e76412a1d0ef7f64959f8ee1...
==========

[commit-bot: I haz the power, 2017-04-18 15:33:32]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/c134e76412a1d0ef7f64959f8ee1...