PyAuto: Collect branding info as a part of GetBrowserInfo()

chrome/browser/automation/automation_provider.cc

Index: chrome/browser/automation/automation_provider.cc
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 621c80c0cd99c4e72d3bdc447fe03fd33ff39bb5..df2cf14ec711d8e891b2c396c035dffc821fbd4c 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -1641,13 +1641,18 @@ void AutomationProvider::GetBrowserInfo(Browser* browser,
                         chrome::kBrowserProcessExecutablePath);
   properties->SetString(L"HelperProcessExecutablePath",
                         chrome::kHelperProcessExecutablePath);
-#if defined(OS_WIN)
   properties->SetString(L"command_line_string",
       CommandLine::ForCurrentProcess()->command_line_string());
-#elif defined(OS_POSIX)
-  properties->SetString(L"command_line_string",
-      JoinString(CommandLine::ForCurrentProcess()->argv(), ' '));
+
+  std::string branding;
+#if defined(GOOGLE_CHROME_BUILD)
+  branding = "Google Chrome";
+#elif defined(CHROMIUM_BUILD)
+  branding = "Chromium";
+#else
+  branding = "Unknown Branding";
 #endif
+  properties->SetString(L"branding", branding);
 
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   return_value->Set(L"properties", properties);