Removing "#if 0" style comments

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/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/signin/signin_manager.h"
@@ skipping 10 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::_;
 using content::BrowserThread;
 
 namespace {
 
-#if 0
-// TODO(altimofeev) See below.
-class BrowserMock: public Browser {
- public:
-  explicit BrowserMock(Type type, Profile* profile) : Browser(type, profile) {}
-
-  MOCK_METHOD2(ExecuteCommandWithDisposition,
-               void(int command_id, WindowOpenDisposition));
-};
-#endif
-
 class FakeLoginUIService: public LoginUIService {
  public:
   FakeLoginUIService() : LoginUIService(NULL) {}
 };
 
 class FakeLoginUI : public LoginUIService::LoginUI {
  public:
   FakeLoginUI() : focus_ui_call_count_(0) {}
 
   virtual ~FakeLoginUI() {}
@@ skipping 15 matching lines @@
   return new FakeLoginUIService();
 }
 
 // Same as BrowserWithTestWindowTest, but uses MockBrowser to test calls to
 // ExecuteCommand method.
 class SyncGlobalErrorTest : public BrowserWithTestWindowTest {
  public:
   SyncGlobalErrorTest() {}
   virtual ~SyncGlobalErrorTest() {}
 
-#if 0
-  // TODO(altimofeev): see below.
-  virtual void SetUp() OVERRIDE {
-    testing::Test::SetUp();
-
-    set_profile(CreateProfile());
-    set_browser(new BrowserMock(Browser::TYPE_TABBED, profile()));
-    set_window(new TestBrowserWindow(browser()));
-    browser()->SetWindowForTesting(window());
-  }
-
-  virtual void TearDown() OVERRIDE {
-    testing::Test::TearDown();
-  }
-#endif
-
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncGlobalErrorTest);
 };
 
 // Utility function to test that SyncGlobalError behaves correct for the given
 // error condition.
 void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
                                  FakeLoginUIService* login_ui_service,
                                  Browser* browser,
                                  SyncGlobalError* error,
@@ skipping 16 matching lines @@
   EXPECT_NE(error->MenuItemCommandID(), 0);
   EXPECT_NE(error->MenuItemLabel().empty(), is_error);
   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)
+  // Check for is_error and sign-out & sign-in to recover in CrOS
   // TODO(altimofeev): Implement this in a way that doesn't involve subclassing
   //                   Browser or using GMock on browser/ui types which is
   //                   banned. Consider observing NOTIFICATION_APP_TERMINATING
   //                   instead.
   //                   http://crbug.com/134675

[Raghu Simha, 2014/01/28 01:40:04]

Technically, this is dead code too, and ought to be removed.

 #else
-#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, _));
-    error->ExecuteMenuItem(browser);
-  }
-#else
   // Test message handler.
   if (is_error) {
     FakeLoginUI* login_ui = static_cast<FakeLoginUI*>(
         login_ui_service->current_login_ui());
     error->ExecuteMenuItem(browser);
     ASSERT_GT(login_ui->focus_ui_call_count(), 0);
     error->BubbleViewAcceptButtonPressed(browser);
     error->BubbleViewDidClose(browser);
   }
 #endif
-#endif
 }
 
 } // namespace
 
 // Test that SyncGlobalError shows an error if a passphrase is required.
 TEST_F(SyncGlobalErrorTest, PassphraseGlobalError) {
   scoped_ptr<Profile> profile(
       ProfileSyncServiceMock::MakeSignedInTestingProfile());
   NiceMock<ProfileSyncServiceMock> service(profile.get());
   SigninManagerBase* signin =
@@ skipping 10 matching lines @@
               .WillRepeatedly(Return(false));
 
   EXPECT_CALL(service, IsPassphraseRequired())
               .WillRepeatedly(Return(true));
   EXPECT_CALL(service, IsPassphraseRequiredForDecryption())
               .WillRepeatedly(Return(true));
   VerifySyncGlobalErrorResult(
       &service, login_ui_service, browser(), &error,
       GoogleServiceAuthError::NONE, true, true);
 }