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

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2010 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/automation/automation_provider.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
@@ skipping 1623 matching lines @@
   DictionaryValue* properties = new DictionaryValue;
   properties->SetString(L"ChromeVersion", chrome::kChromeVersion);
   properties->SetString(L"BrowserProcessExecutableName",
                         chrome::kBrowserProcessExecutableName);
   properties->SetString(L"HelperProcessExecutableName",
                         chrome::kHelperProcessExecutableName);
   properties->SetString(L"BrowserProcessExecutablePath",
                         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);
 
   return_value->SetInteger(L"browser_pid", base::GetCurrentProcId());
   // Add info about all windows in a list of dictionaries, one dictionary
   // item per window.
   ListValue* windows = new ListValue;
   int windex = 0;
   for (BrowserList::const_iterator it = BrowserList::begin();
@@ skipping 1843 matching lines @@
 }
 
 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
   NOTIMPLEMENTED();
 }
 #endif  // !defined(TOOLKIT_VIEWS)
 
 void AutomationProvider::ResetToDefaultTheme() {
   profile_->ClearTheme();
 }