Make the GGRV brand code non-organic.

chrome/browser/google/google_brand.cc

 // Copyright 2014 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 "chrome/browser/google/google_brand.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 72 matching lines @@
 
 bool IsOrganic(const std::string& brand) {
 #if defined(OS_MACOSX)
   if (brand.empty()) {
     // An empty brand string on Mac is used for channels other than stable,
     // which are always organic.
     return true;
   }
 #endif
 
   const char* const kBrands[] = {

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

Nit: Maybe this should be kOrganicBrands?

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

Done.

       "CHCA", "CHCB", "CHCG", "CHCH", "CHCI", "CHCJ", "CHCK", "CHCL",
       "CHFO", "CHFT", "CHHS", "CHHM", "CHMA", "CHMB", "CHME", "CHMF",
       "CHMG", "CHMH", "CHMI", "CHMQ", "CHMV", "CHNB", "CHNC", "CHNG",
       "CHNH", "CHNI", "CHOA", "CHOB", "CHOC", "CHON", "CHOO", "CHOP",
       "CHOQ", "CHOR", "CHOS", "CHOT", "CHOU", "CHOX", "CHOY", "CHOZ",
       "CHPD", "CHPE", "CHPF", "CHPG", "ECBA", "ECBB", "ECDA", "ECDB",
       "ECSA", "ECSB", "ECVA", "ECVB", "ECWA", "ECWB", "ECWC", "ECWD",
       "ECWE", "ECWF", "EUBB", "EUBC", "GGLA", "GGLS"
   };
   const char* const* end = &kBrands[arraysize(kBrands)];
   const char* const* found = std::find(&kBrands[0], end, brand);

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

Nit: Could probably use binary_search() in place of find()

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

Done.

   if (found != end)
     return true;
 
+  // The Chrome enterprise brand code is the only GGR* brand to be non-organic.
+  if (brand == "GGRV")
+    return false;
+
   return base::StartsWith(brand, "EUB", base::CompareCase::SENSITIVE) ||
          base::StartsWith(brand, "EUC", base::CompareCase::SENSITIVE) ||
          base::StartsWith(brand, "GGR", base::CompareCase::SENSITIVE);
 }
 
 bool IsOrganicFirstRun(const std::string& brand) {
 #if defined(OS_MACOSX)
   if (brand.empty()) {
     // An empty brand string on Mac is used for channels other than stable,
     // which are always organic.
@@ skipping 21 matching lines @@
   DCHECK(g_brand_for_testing == NULL);
   g_brand_for_testing = brand_.c_str();
 }
 
 BrandForTesting::~BrandForTesting() {
   g_brand_for_testing = NULL;
 }
 
 
 }  // namespace google_brand