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

Index: chrome/browser/sync/sync_global_error_unittest.cc
===================================================================
--- chrome/browser/sync/sync_global_error_unittest.cc	(revision 127082)
+++ chrome/browser/sync/sync_global_error_unittest.cc	(working copy)
@@ -17,10 +17,9 @@
 #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 {
@@ -29,8 +28,7 @@
  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
@@ -89,8 +87,7 @@
 #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