Make the GGRV brand code non-organic.

chrome/browser/google/google_update_settings_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/test/scoped_path_override.h"
 #include "build/build_config.h"
@@ skipping 32 matching lines @@
   EXPECT_TRUE(GoogleUpdateSettings::RemoveLastRunTime());
   EXPECT_EQ(-1, GoogleUpdateSettings::GetLastRunTime());
   // Setting and querying the last update time in fast sequence
   // should give 0 days.
   EXPECT_TRUE(GoogleUpdateSettings::SetLastRunTime());
   EXPECT_EQ(0, GoogleUpdateSettings::GetLastRunTime());
 }
 
 #endif  // defined(OS_WIN)
 
+TEST_F(GoogleUpdateTest, IsOrganic) {
+  // Test some brand codes to ensure that future changes to this method won't
+  // go unnoticed.
+  EXPECT_FALSE(google_brand::IsOrganic("GGRV"));

[Peter Kasting, 2017/04/12 20:05:20]

Nit: Also EXPECT_TRUE for GGRsomething_else?

[Roger Tawa OOO till Jul 10th, 2017/04/12 21:51:43]

Do you think I should do all the letters?

[Peter Kasting, 2017/04/12 22:46:03]

Not necessarily, I was mainly thinking of catching someone flipping GGR* to
false.  Do whatever you think is necessary?

+}
+
 TEST_F(GoogleUpdateTest, IsOrganicFirstRunBrandCodes) {
   // Test some brand codes to ensure that future changes to this method won't
   // go unnoticed.
   EXPECT_FALSE(google_brand::IsOrganicFirstRun("CHFO"));
   EXPECT_FALSE(google_brand::IsOrganicFirstRun("CHMA"));
   EXPECT_TRUE(google_brand::IsOrganicFirstRun("EUBA"));
   EXPECT_TRUE(google_brand::IsOrganicFirstRun("GGRA"));
 
 #if defined(OS_MACOSX)
   // An empty brand string on Mac is used for channels other than stable,
@@ skipping 12 matching lines @@
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &consent_dir));
   ASSERT_TRUE(base::DirectoryExists(consent_dir));
 
   base::FilePath consent_file = consent_dir.Append("Consent To Send Stats");
   ASSERT_TRUE(base::PathExists(consent_file));
   int permissions;
   ASSERT_TRUE(base::GetPosixFilePermissions(consent_file, &permissions));
   EXPECT_TRUE(permissions & base::FILE_PERMISSION_READ_BY_OTHERS);
 }
 #endif