Revert 61899 for breaking cookes on file:// URLs....

chrome/service/service_process.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/service/service_process.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 368 matching lines @@
     const std::string& login,
     const std::string& token,
     const std::string& host_id,
     const std::string& host_name,
     remoting::HostKeyPair* host_key_pair) {
   // First we need to load the config first.
   LoadChromotingConfig();
 
   // And then do the update.
   chromoting_config_->Update(
-      NewRunnableFunction(&SaveChromotingConfigFunc,
-                          chromoting_config_,
-                          login,
-                          token,
-                          host_id,
-                          host_name));
+      NewRunnableFunction(&SaveChromotingConfigFunc, chromoting_config_.get(),
+                          login, token, host_id, host_name));
 
   // And then save the key pair.
   host_key_pair->Save(chromoting_config_);
 }
 
 void ServiceProcess::LoadChromotingConfig() {
   // TODO(hclam): We really should be doing this on IO thread so we are not
   // blocked on file IOs.
   if (chromoting_config_)
     return;
@@ skipping 15 matching lines @@
 #endif
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }
 
 // Disable refcounting for runnable method because it is really not needed
 // when we post tasks on the main message loop.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess);