Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i…

chrome/browser/sync/sync_global_error_unittest.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/sync/sync_global_error.h"
 
 #include "base/basictypes.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock-actions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnRef;
-using ::testing::_;
+using ::testing::NiceMock;
 using content::BrowserThread;
 
 namespace {
 
 class BrowserMock: public Browser {
  public:
   explicit BrowserMock(Type type, Profile* profile) : Browser(type, profile) {}
 
-  MOCK_METHOD2(ExecuteCommandWithDisposition,
-               void(int command_id, WindowOpenDisposition));
+  MOCK_METHOD1(ExecuteCommand, void(int command_id));
 };
 
 // Same as BrowserWithTestWindowTest, but uses MockBrowser to test calls to
 // ExecuteCommand method.
 class SyncGlobalErrorTest : public BrowserWithTestWindowTest {
  public:
   SyncGlobalErrorTest() {}
   virtual ~SyncGlobalErrorTest() {}
 
   virtual void SetUp() OVERRIDE {
@@ skipping 38 matching lines @@
   EXPECT_NE(error->GetBubbleViewAcceptButtonLabel().empty(), is_error);
 
   // We never have a cancel button.
   EXPECT_TRUE(error->GetBubbleViewCancelButtonLabel().empty());
   // We always return a hardcoded title.
   EXPECT_FALSE(error->GetBubbleViewTitle().empty());
 
 #if defined(OS_CHROMEOS)
   if (error_state != GoogleServiceAuthError::NONE) {
     // In CrOS sign-in/sign-out is made to fix the error.
-    EXPECT_CALL(*static_cast<BrowserMock*>(browser),
-                ExecuteCommandWithDisposition(IDC_EXIT, _));
+    EXPECT_CALL(*static_cast<BrowserMock*>(browser), ExecuteCommand(IDC_EXIT));
     error->ExecuteMenuItem(browser);
   }
 #else
   // Test message handler.
   if (is_error) {
     EXPECT_CALL(*service, ShowErrorUI());
     error->ExecuteMenuItem(browser);
     EXPECT_CALL(*service, ShowErrorUI());
     error->BubbleViewAcceptButtonPressed(browser);
     error->BubbleViewDidClose(browser);
@@ skipping 48 matching lines @@
     { GoogleServiceAuthError::HOSTED_NOT_ALLOWED, true },
   };
 
   for (size_t i = 0; i < sizeof(table)/sizeof(*table); ++i) {
     VerifySyncGlobalErrorResult(&service, browser(), &error,
                                 table[i].error_state, true, table[i].is_error);
     VerifySyncGlobalErrorResult(&service, browser(), &error,
                                 table[i].error_state, false, false);
   }
 }