Revert 184352

chrome/installer/setup/chrome_frame_ready_mode.cc

 // Copyright (c) 2011 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/installer/setup/chrome_frame_ready_mode.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 197 matching lines @@
 
   // Replace the ChromeFrame user agent string in the registry, modify the
   // ReadyMode state flag.
   const Version& installed_version = cf_state->version();
 
   scoped_ptr<WorkItemList> item_list(WorkItem::CreateWorkItemList());
 
   HKEY root = installer_state.root_key();
 
   std::wstring chrome_frame_ua_value_name(kChromeFramePrefix);
-  chrome_frame_ua_value_name +=
-      base::ASCIIToWide(installed_version.GetString());
+  chrome_frame_ua_value_name += ASCIIToWide(installed_version.GetString());
 
   // Store the Chrome Frame user agent string
   item_list->AddSetRegValueWorkItem(root, kPostPlatformUAKey,
                                     chrome_frame_ua_value_name, L"", true);
   // Add a work item to update the Ready Mode state flag
   BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BINARIES);
   item_list->AddSetRegValueWorkItem(root, dist->GetStateKey(),
                                     kChromeFrameReadyModeField,
                                     static_cast<int64>(1), true);
 
   if (!item_list->Do()) {
     LOG(ERROR) << "Failed to end temporary opt out of GCF";
     item_list->Rollback();
     status = READY_MODE_END_TEMP_OPT_OUT_FAILED;
   }
 
   return status;
 }
 
 }  // namespace installer