Move build flags to .gni file.

build/config/chrome_build.gni

Index: build/config/chrome_build.gni
diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
index e2ff123543c61c474888854cb24fc3506f08a7df..c2132c4a1624c255ca9e6c23a33cd443372f45d9 100644
--- a/build/config/chrome_build.gni
+++ b/build/config/chrome_build.gni
@@ -6,17 +6,14 @@ declare_args() {
   # Selects the desired build flavor. Official builds get additional
   # processing to prepare for release. Normally you will want to develop and
   # test with this flag off.
-  # TODO(brettw) move here from BUILDCONFIG.gn when DEPS are updated.
-  #is_official_build = false
+  is_official_build = false
 
   # Select the desired branding flavor. False means normal Chromium branding,
   # true means official Google Chrome branding (requires extra Google-internal
   # resources).
-  # TODO(brettw) move here from BUILDCONFIG.gn when DEPS are updated.
-  #is_chrome_branded = false
+  is_chrome_branded = false
 
   # Break chrome.dll into multple pieces based on process type. Only available
   # on Windows.
-  # TODO(brettw) make this work. When it does, the declaration should be:
   is_multi_dll_chrome = is_win && !is_component_build
 }