Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Unified Diff: chrome/browser/sync/sync_global_error_unittest.cc

Issue 140883012: Removing "#if 0" style comments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove empty #if branch Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_global_error_unittest.cc
diff --git a/chrome/browser/sync/sync_global_error_unittest.cc b/chrome/browser/sync/sync_global_error_unittest.cc
index ee798ea6961ad2b030a71000ca08d0fadedef900..a1f06da90f267f9a8e7ac272a9f5cb27d35538bf 100644
--- a/chrome/browser/sync/sync_global_error_unittest.cc
+++ b/chrome/browser/sync/sync_global_error_unittest.cc
@@ -28,17 +28,6 @@ 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) {}
@@ -74,22 +63,6 @@ class SyncGlobalErrorTest : public BrowserWithTestWindowTest {
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);
};
@@ -125,21 +98,12 @@ void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
// We always return a hardcoded title.
EXPECT_FALSE(error->GetBubbleViewTitle().empty());
-#if defined(OS_CHROMEOS)
- // 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.
+ // TODO(altimofeev): Implement this for ChromeOS 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
-#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
+#if !defined(OS_CHROMEOS)
// Test message handler.
if (is_error) {
FakeLoginUI* login_ui = static_cast<FakeLoginUI*>(
@@ -150,7 +114,6 @@ void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
error->BubbleViewDidClose(browser);
}
#endif
-#endif
}
} // namespace
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698