Add account_id to signin manager notifications.

chrome/browser/ui/webui/options/options_ui_browsertest.cc

 // Copyright (c) 2012 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/ui/webui/options/options_ui_browsertest.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 50 matching lines @@
   void Wait() {
     if (seen_)
       return;
 
     running_ = true;
     message_loop_runner_ = new MessageLoopRunner;
     message_loop_runner_->Run();
     EXPECT_TRUE(seen_);
   }
 
-  virtual void GoogleSignedOut(const std::string& username) OVERRIDE {
+  virtual void GoogleSignedOut(const std::string& account_id,
+                               const std::string& username) OVERRIDE {
     seen_ = true;
     if (!running_)
       return;
 
     message_loop_runner_->Quit();
     running_ = false;
   }
 
  private:
   bool seen_;
@@ skipping 248 matching lines @@
   run_loop.Run();
 
   // Verify that the settings page has updated and lists two profiles.
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       contents, javascript, &profiles));
   EXPECT_EQ(2, profiles);
 }
 #endif
 
 }  // namespace options