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

chrome/browser/command_updater_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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 "base/compiler_specific.h"
 #include "chrome/browser/command_updater.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestingCommandHandlerMock
     : public CommandUpdater::CommandUpdaterDelegate {
  public:
-  virtual void ExecuteCommandWithDisposition(int id,
-                                             WindowOpenDisposition) OVERRIDE {
+  virtual void ExecuteCommand(int id) {
     EXPECT_EQ(1, id);
   }
 };
 
 class CommandUpdaterTest : public testing::Test {
 };
 
 class TestingCommandObserverMock : public CommandUpdater::CommandObserver {
  public:
   TestingCommandObserverMock() : enabled_(true) {}
@@ skipping 76 matching lines @@
 
   // Remove one observer and update the command. Check the states, which
   // should be different.
   command_updater.RemoveCommandObserver(&observer_remove);
   command_updater.UpdateCommandEnabled(1, false);
   command_updater.UpdateCommandEnabled(2, false);
   command_updater.UpdateCommandEnabled(3, false);
   EXPECT_TRUE(observer_remove.enabled());
   EXPECT_FALSE(observer_keep.enabled());
 }