Fix crash due to parsing of raw branch code from Google Update

chrome/browser/views/about_chrome_view.cc

Index: chrome/browser/views/about_chrome_view.cc
===================================================================
--- chrome/browser/views/about_chrome_view.cc	(revision 35456)
+++ chrome/browser/views/about_chrome_view.cc	(working copy)
@@ -137,18 +137,19 @@
   }
 
   current_version_ = version_info->file_version();
-#if !defined(GOOGLE_CHROME_BUILD)
-  current_version_ += L" (";
-  current_version_ += version_info->last_change();
-  current_version_ += L")";
-#endif
 
   string16 version_modifier = platform_util::GetVersionStringModifier();
   if (version_modifier.length()) {
-    current_version_ += L" ";
-    current_version_ += UTF16ToWide(version_modifier);
+    version_details_ += L" ";
+    version_details_ += UTF16ToWide(version_modifier);
   }
 
+#if !defined(GOOGLE_CHROME_BUILD)
+  version_details_ += L" (";
+  version_details_ += version_info->last_change();
+  version_details_ += L")";
+#endif
+
   // Views we will add to the *parent* of this dialog, since it will display
   // next to the buttons which we don't draw ourselves.
   throbber_.reset(new views::Throbber(50, true));
@@ -194,7 +195,7 @@
 
   // This is a text field so people can copy the version number from the dialog.
   version_label_ = new views::Textfield();
-  version_label_->SetText(WideToUTF16Hack(current_version_));
+  version_label_->SetText(WideToUTF16Hack(current_version_ + version_details_));
   version_label_->SetReadOnly(true);
   version_label_->RemoveBorder();
   version_label_->SetTextColor(SK_ColorBLACK);