Add support for reactivating a chrome install that originally used an

Add support for reactivating a chrome install that originally used an
organic brand code.  Also added unit tests for reactivation since none
existed.

BUG=b/5683002
TEST=See unit tests.  Pings should only be sent out for non-organic brand
codes, and not for organic brand codes.  Should test will all four combinations
(main is either organic or not, and reactivation is either organic or not).
This only works with google chrome builds.  Chromium builds never send pings
regardless of brand codes.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=112868

[Alexei Svitkine (slow), 2011-12-02 20:40:17]

LGTM

http://codereview.chromium.org/8726041/diff/1/chrome/browser/rlz/rlz_unittest.cc
File chrome/browser/rlz/rlz_unittest.cc (right):

http://codereview.chromium.org/8726041/diff/1/chrome/browser/rlz/rlz_unittest...
chrome/browser/rlz/rlz_unittest.cc:206:
SetRegistryBrandValue(google_update::kRegRLZBrandField, brand);
Can you add:

std::string check_brand;
google_util::GetBrand(&check_brand);
EXPECT_EQ(brand, check_brand);

To verify this succeeded.

http://codereview.chromium.org/8726041/diff/1/chrome/browser/rlz/rlz_unittest...
chrome/browser/rlz/rlz_unittest.cc:210:
SetRegistryBrandValue(google_update::kRegRLZReactivationBrandField, brand);
Can you add:

std::string check_brand;
google_util::GetReactivationBrand(&check_brand);
EXPECT_EQ(brand, check_brand);

To verify this succeeded.

[Roger Tawa OOO till Jul 10th, 2011-12-02 20:53:56]

Thanks Alexei.  Addressed all comments, created bug to track background thread
linked to the code.  Changes uploaded.  Will commit after trybots are green.

http://codereview.chromium.org/8726041/diff/1/chrome/browser/rlz/rlz_unittest.cc
File chrome/browser/rlz/rlz_unittest.cc (right):

http://codereview.chromium.org/8726041/diff/1/chrome/browser/rlz/rlz_unittest...
chrome/browser/rlz/rlz_unittest.cc:206:
SetRegistryBrandValue(google_update::kRegRLZBrandField, brand);
On 2011/12/02 20:40:17, Alexei Svitkine wrote:
> Can you add:
> 
> std::string check_brand;
> google_util::GetBrand(&check_brand);
> EXPECT_EQ(brand, check_brand);
> 
> To verify this succeeded.

Done.

http://codereview.chromium.org/8726041/diff/1/chrome/browser/rlz/rlz_unittest...
chrome/browser/rlz/rlz_unittest.cc:210:
SetRegistryBrandValue(google_update::kRegRLZReactivationBrandField, brand);
On 2011/12/02 20:40:17, Alexei Svitkine wrote:
> Can you add:
> 
> std::string check_brand;
> google_util::GetReactivationBrand(&check_brand);
> EXPECT_EQ(brand, check_brand);
> 
> To verify this succeeded.

Done.

[Glenn Wilson, 2011-12-02 21:35:02]

LGTM

http://codereview.chromium.org/8726041/diff/5001/chrome/browser/rlz/rlz.cc
File chrome/browser/rlz/rlz.cc (right):

http://codereview.chromium.org/8726041/diff/5001/chrome/browser/rlz/rlz.cc#ne...
chrome/browser/rlz/rlz.cc:44: return brand.empty() ||
google_util::IsOrganic(brand);
It's been a while, this is is pass-by-value, right?  Do you need any protection
for a null brand here?

[Roger Tawa OOO till Jul 10th, 2011-12-02 22:00:20]

Thanks Glenn.  See comment below.

http://codereview.chromium.org/8726041/diff/5001/chrome/browser/rlz/rlz.cc
File chrome/browser/rlz/rlz.cc (right):

http://codereview.chromium.org/8726041/diff/5001/chrome/browser/rlz/rlz.cc#ne...
chrome/browser/rlz/rlz.cc:44: return brand.empty() ||
google_util::IsOrganic(brand);
On 2011/12/02 21:35:02, Glenn Wilson wrote:
> It's been a while, this is is pass-by-value, right?  Do you need any
protection
> for a null brand here?

Right, no need to check for null.

[commit-bot: I haz the power, 2011-12-03 01:11:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rogerta@chromium.org/8726041/5001

[commit-bot: I haz the power, 2011-12-03 04:23:03]

Change committed as 112868