Move DefaultSearchPolicyHandler to live in search_engines.

Move DefaultSearchPolicyHandler to live in search_engines.

This facilitates the refactoring of the policy code into a layered
component.

BUG=271392
[email protected], [email protected]

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

[Joao da Silva, 2013-10-14 10:02:28]

Mostly good. We can clean up the code a bit given that it won't move into the
component (e.g. no need to indirectly use the pref names anymore)

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
File chrome/browser/search_engines/OWNERS (right):

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/OWNERS:13: per-file
search_provider_policy_handler.*[email protected]
The filename needs to be fixed, and the pattern should include the unittest:

default_search_policy_handler*

It's also a lot of reviewers, maybe just you and me? (Same as
chrome/app/policy/OWNERS)

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
File chrome/browser/search_engines/default_search_policy_handler.h (right):

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/default_search_policy_handler.h:13: // exactly
DEFAULT_SEARCH_KEY entries, which are sorted according to the order
DEFAULT_SEARCH_KEY_SIZE

Also, declare the enum before this, so that the enum & the constant are listed
before this comment.

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/default_search_policy_handler.h:21: explicit
DefaultSearchEncodingsPolicyHandler(const char* pref_name);
See below about pref_name here.

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/default_search_policy_handler.h:35: enum
DefaultSearchKey {
See below, I think we can remove this.

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/default_search_policy_handler.h:69: const
PolicyToPreferenceMapEntry policy_to_pref_map[]);
This was introduced back when we planned to move these classes into the
component, but we can simplify it now that it lives in
chrome/browser/search_engines:

- the cc file can refer directly to the pref_names
- the kDefaultSearchEnginePolicyMap array can be internal to the cc file, and
the enum is not needed anymore either
- the unittest is also not needed after making these changes

[dconnelly, 2013-10-14 10:05:40]

I'd also like to move the DefaultSearch PrefStoreTest as part of this CL.
 I didn't think of it until just now.  WDYT?


On Mon, Oct 14, 2013 at 12:02 PM, <[email protected]> wrote:

> Mostly good. We can clean up the code a bit given that it won't move into
> the
> component (e.g. no need to indirectly use the pref names anymore)
>
>
> https://codereview.chromium.**org/27166002/diff/5001/chrome/**
>
browser/search_engines/OWNERS<https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engines/OWNERS>
> File chrome/browser/search_engines/**OWNERS (right):
>
> https://codereview.chromium.**org/27166002/diff/5001/chrome/**
>
browser/search_engines/OWNERS#**newcode13<https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engines/OWNERS#newcode13>
> chrome/browser/search_engines/**OWNERS:13: per-file
>
search_provider_policy_**handler.*=dconnelly@chromium.**org<dconnelly@chromiu...
> The filename needs to be fixed, and the pattern should include the
> unittest:
>
> default_search_policy_handler*
>
> It's also a lot of reviewers, maybe just you and me? (Same as
> chrome/app/policy/OWNERS)
>
> https://codereview.chromium.**org/27166002/diff/5001/chrome/**
>
browser/search_engines/**default_search_policy_handler.**h<https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engines/default_search_policy_handler.h>
> File chrome/browser/search_engines/**default_search_policy_handler.**h
> (right):
>
> https://codereview.chromium.**org/27166002/diff/5001/chrome/**
>
browser/search_engines/**default_search_policy_handler.**h#newcode13<https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engines/default_search_policy_handler.h#newcode13>
> chrome/browser/search_engines/**default_search_policy_handler.**h:13: //
> exactly DEFAULT_SEARCH_KEY entries, which are sorted according to the
> order
> DEFAULT_SEARCH_KEY_SIZE
>
> Also, declare the enum before this, so that the enum & the constant are
> listed before this comment.
>
> https://codereview.chromium.**org/27166002/diff/5001/chrome/**
>
browser/search_engines/**default_search_policy_handler.**h#newcode21<https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engines/default_search_policy_handler.h#newcode21>
> chrome/browser/search_engines/**default_search_policy_handler.**h:21:
> explicit DefaultSearchEncodingsPolicyHa**ndler(const char* pref_name);
> See below about pref_name here.
>
> https://codereview.chromium.**org/27166002/diff/5001/chrome/**
>
browser/search_engines/**default_search_policy_handler.**h#newcode35<https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engines/default_search_policy_handler.h#newcode35>
> chrome/browser/search_engines/**default_search_policy_handler.**h:35: enum
> DefaultSearchKey {
> See below, I think we can remove this.
>
> https://codereview.chromium.**org/27166002/diff/5001/chrome/**
>
browser/search_engines/**default_search_policy_handler.**h#newcode69<https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engines/default_search_policy_handler.h#newcode69>
> chrome/browser/search_engines/**default_search_policy_handler.**h:69:
> const
> PolicyToPreferenceMapEntry policy_to_pref_map[]);
> This was introduced back when we planned to move these classes into the
> component, but we can simplify it now that it lives in
> chrome/browser/search_engines:
>
> - the cc file can refer directly to the pref_names
> - the kDefaultSearchEnginePolicyMap array can be internal to the cc
> file, and the enum is not needed anymore either
> - the unittest is also not needed after making these changes
>
>
https://codereview.chromium.**org/27166002/<https://codereview.chromium.org/2...
>

To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].

[Joao da Silva, 2013-10-14 10:08:54]

On Mon, Oct 14, 2013 at 12:05 PM, Daniel Connelly
<[email protected]>wrote:

> I'd also like to move the DefaultSearch PrefStoreTest as part of this CL.
>  I didn't think of it until just now.  WDYT?
>

Yes, good call. Its test class will need to duplicate some of
ConfigurationPolicyPrefStoreTest, which is fine.

To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].

[dconnelly, 2013-10-14 15:22:25]

Moved the unit tests from PrefStoreTest by exposing as public and deriving from
ConfigurationPolicyPrefStoreTest.

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
File chrome/browser/search_engines/OWNERS (right):

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/OWNERS:13: per-file
search_provider_policy_handler.*[email protected]
On 2013/10/14 10:02:29, Joao da Silva wrote:
> The filename needs to be fixed, and the pattern should include the unittest:
> 
> default_search_policy_handler*
> 
> It's also a lot of reviewers, maybe just you and me? (Same as
> chrome/app/policy/OWNERS)

Done.

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
File chrome/browser/search_engines/default_search_policy_handler.h (right):

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/default_search_policy_handler.h:21: explicit
DefaultSearchEncodingsPolicyHandler(const char* pref_name);
On 2013/10/14 10:02:29, Joao da Silva wrote:
> See below about pref_name here.

Done.

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/default_search_policy_handler.h:35: enum
DefaultSearchKey {
On 2013/10/14 10:02:29, Joao da Silva wrote:
> See below, I think we can remove this.

Done.

https://codereview.chromium.org/27166002/diff/5001/chrome/browser/search_engi...
chrome/browser/search_engines/default_search_policy_handler.h:69: const
PolicyToPreferenceMapEntry policy_to_pref_map[]);
On 2013/10/14 10:02:29, Joao da Silva wrote:
> This was introduced back when we planned to move these classes into the
> component, but we can simplify it now that it lives in
> chrome/browser/search_engines:
> 
> - the cc file can refer directly to the pref_names
> - the kDefaultSearchEnginePolicyMap array can be internal to the cc file, and
> the enum is not needed anymore either
> - the unittest is also not needed after making these changes

Done.

[Joao da Silva, 2013-10-14 16:34:56]

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
File chrome/browser/policy/configuration_policy_pref_store_unittest.cc (left):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.cc:25: #include
"testing/gmock/include/gmock/gmock.h"
Keep gmock.h, it's used

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
File chrome/browser/policy/configuration_policy_pref_store_unittest.cc (right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.cc:57: void
ConfigurationPolicyPrefStoreTest::TearDown() { provider_.Shutdown(); }
break into multiple lines

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
File chrome/browser/policy/configuration_policy_pref_store_unittest.h (right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.h:1: // Copyright
(c) 2012 The Chromium Authors. All rights reserved.
2013

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.h:30:
scoped_ptr<PolicyServiceImpl> policy_service_;
Use the interface type here (PolicyService)

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.h:33: };
private:
 DISALLOW_COPY_AND_ASSIGN

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
File chrome/browser/search_engines/default_search_policy_handler.cc (right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.cc:243:
prefs->SetString(prefs::kDefaultSearchProviderName, std::string());
kDefaultSearchProviderPrepopulateID here

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.cc:251: #undef
PREF_FOR
Remove :-)

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
File chrome/browser/search_engines/default_search_policy_handler.h (right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.h:16: explicit
DefaultSearchEncodingsPolicyHandler();
no need for explicit

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.h:36: //    
according to the DefaultSearchKey enum.
No need to document args that don't exist :-)

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.h:77:
std::vector<TypeCheckingPolicyHandler*> handlers_;
#include <vector>

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
File chrome/browser/search_engines/default_search_policy_handler_unittest.cc
(right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler_unittest.cc:24:
static const char* const kSearchURL;
static const char kSearchURL[] (same for the others; I noticed it was like this
before)

https://codereview.chromium.org/27166002/diff/15015/chrome/chrome_tests_unit....
File chrome/chrome_tests_unit.gypi (left):

https://codereview.chromium.org/27166002/diff/15015/chrome/chrome_tests_unit....
chrome/chrome_tests_unit.gypi:1082:
'browser/policy/configuration_policy_pref_store_unittest.cc',
Also:

'browser/policy/configuration_policy_pref_store_unittest.h',

[dconnelly, 2013-10-15 09:07:49]

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
File chrome/browser/policy/configuration_policy_pref_store_unittest.cc (left):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.cc:25: #include
"testing/gmock/include/gmock/gmock.h"
On 2013/10/14 16:34:57, Joao da Silva wrote:
> Keep gmock.h, it's used

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
File chrome/browser/policy/configuration_policy_pref_store_unittest.cc (right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.cc:57: void
ConfigurationPolicyPrefStoreTest::TearDown() { provider_.Shutdown(); }
On 2013/10/14 16:34:57, Joao da Silva wrote:
> break into multiple lines

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
File chrome/browser/policy/configuration_policy_pref_store_unittest.h (right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.h:1: // Copyright
(c) 2012 The Chromium Authors. All rights reserved.
On 2013/10/14 16:34:57, Joao da Silva wrote:
> 2013

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.h:30:
scoped_ptr<PolicyServiceImpl> policy_service_;
On 2013/10/14 16:34:57, Joao da Silva wrote:
> Use the interface type here (PolicyService)

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.h:33: };
On 2013/10/14 16:34:57, Joao da Silva wrote:
> private:
>  DISALLOW_COPY_AND_ASSIGN

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
File chrome/browser/search_engines/default_search_policy_handler.cc (right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.cc:243:
prefs->SetString(prefs::kDefaultSearchProviderName, std::string());
On 2013/10/14 16:34:57, Joao da Silva wrote:
> kDefaultSearchProviderPrepopulateID here

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.cc:251: #undef
PREF_FOR
On 2013/10/14 16:34:57, Joao da Silva wrote:
> Remove :-)

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
File chrome/browser/search_engines/default_search_policy_handler.h (right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.h:16: explicit
DefaultSearchEncodingsPolicyHandler();
On 2013/10/14 16:34:57, Joao da Silva wrote:
> no need for explicit

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.h:36: //    
according to the DefaultSearchKey enum.
On 2013/10/14 16:34:57, Joao da Silva wrote:
> No need to document args that don't exist :-)

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler.h:77:
std::vector<TypeCheckingPolicyHandler*> handlers_;
On 2013/10/14 16:34:57, Joao da Silva wrote:
> #include <vector>

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
File chrome/browser/search_engines/default_search_policy_handler_unittest.cc
(right):

https://codereview.chromium.org/27166002/diff/15015/chrome/browser/search_eng...
chrome/browser/search_engines/default_search_policy_handler_unittest.cc:24:
static const char* const kSearchURL;
On 2013/10/14 16:34:57, Joao da Silva wrote:
> static const char kSearchURL[] (same for the others; I noticed it was like
this
> before)

Done.

https://codereview.chromium.org/27166002/diff/15015/chrome/chrome_tests_unit....
File chrome/chrome_tests_unit.gypi (left):

https://codereview.chromium.org/27166002/diff/15015/chrome/chrome_tests_unit....
chrome/chrome_tests_unit.gypi:1082:
'browser/policy/configuration_policy_pref_store_unittest.cc',
On 2013/10/14 16:34:57, Joao da Silva wrote:
> Also:
> 
> 'browser/policy/configuration_policy_pref_store_unittest.h',

Done.

[Joao da Silva, 2013-10-15 09:19:25]

lgtm

You need a search_engines reviewer; I suggest Peter (pkasting)

[dconnelly, 2013-10-15 09:47:57]

Hi Peter,

I need OWNERS approval for chrome/browser/search_engines.  For more information
on this change you can look at the associated bug and my post on chromium-dev:
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/VKD7p-2Ngwg

Thanks,
Daniel

[pneubeck (no reviews), 2013-10-15 12:33:18]

https://codereview.chromium.org/27166002/diff/34001/chrome/browser/policy/con...
File chrome/browser/policy/configuration_policy_pref_store_unittest.h (right):

https://codereview.chromium.org/27166002/diff/34001/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.h:26: void
UpdateProviderPolicy(const PolicyMap& policy);
forward declaration instead of include?

[dconnelly, 2013-10-15 13:45:05]

https://codereview.chromium.org/27166002/diff/34001/chrome/browser/policy/con...
File chrome/browser/policy/configuration_policy_pref_store_unittest.h (right):

https://codereview.chromium.org/27166002/diff/34001/chrome/browser/policy/con...
chrome/browser/policy/configuration_policy_pref_store_unittest.h:26: void
UpdateProviderPolicy(const PolicyMap& policy);
On 2013/10/15 12:33:18, pneubeck wrote:
> forward declaration instead of include?

Done.

[Peter Kasting, 2013-10-15 19:31:45]

Rubber-stamp LGTM assuming you merely moved the files and fixed up
#includes/guards/etc.

Did you svn mv these files?  Normally I'd be able to tell the answer to the
sentence above from the diff, but this diff shows the files as just "added".

[dconnelly, 2013-10-16 08:23:27]

On 2013/10/15 19:31:45, Peter Kasting wrote:
> Rubber-stamp LGTM assuming you merely moved the files and fixed up
> #includes/guards/etc.
> 
> Did you svn mv these files?  Normally I'd be able to tell the answer to the
> sentence above from the diff, but this diff shows the files as just "added".

No. These are new files that are split out from the existing
configuration_policy_handler and configuration_policy_pref_store_unittest.

[commit-bot: I haz the power, 2013-10-17 11:01:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/27166002/67001

[commit-bot: I haz the power, 2013-10-17 13:12:27]

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

[commit-bot: I haz the power, 2013-10-17 13:18:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/27166002/67001

[dconnelly, 2013-10-17 13:28:13]

Committed patchset #11 manually as r229124 (presubmit successful).