Revert of Propagate is_official_build to version script.

build/util/version.py

Index: build/util/version.py
diff --git a/build/util/version.py b/build/util/version.py
index 767412e93d1cdc02abbf0a2f6347c3c600ecb632..4d3691ae373dd139e6b49f488ffe6d8d98d9f0db 100755
--- a/build/util/version.py
+++ b/build/util/version.py
@@ -27,7 +27,7 @@
     values_dict[key] = val
 
 
-def fetch_values(file_list, is_official_build=None):
+def fetch_values(file_list):
   """
   Returns a dictionary of values to be used for substitution, populating
   the dictionary with KEYWORD=VALUE settings from the files in 'file_list'.
@@ -37,7 +37,7 @@
     OFFICIAL_BUILD
   """
   CHROME_BUILD_TYPE = os.environ.get('CHROME_BUILD_TYPE')
-  if CHROME_BUILD_TYPE == '_official' or is_official_build:
+  if CHROME_BUILD_TYPE == '_official':
     official_build = '1'
   else:
     official_build = '0'
@@ -113,10 +113,6 @@
                       help='Evaluate VAL after reading variables. Can be used '
                            'to synthesize variables. e.g. -e \'PATCH_HI=int('
                            'PATCH)/256.')
-  parser.add_argument('--official', action='store_true',
-                      help='Whether the current build should be an official '
-                           'build, used in addition to the environment '
-                           'variable.')
   parser.add_argument('args', nargs=argparse.REMAINDER,
                       help='For compatibility: INPUT and OUTPUT can be '
                            'passed as positional arguments.')
@@ -140,7 +136,7 @@
   if options.args:
     parser.error('Unexpected arguments: %r' % options.args)
 
-  values = fetch_values(options.file, options.official)
+  values = fetch_values(options.file)
   for key, val in evals.iteritems():
     values[key] = str(eval(val, globals(), values))