Replace ScopedCommandLineOverride with TestSuite listener.

chrome/browser/history/top_sites_unittest.cc

 // Copyright (c) 2011 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/bind.h"
 #include "base/bind_helpers.h"
-#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_marshaling.h"
@@ skipping 109 matching lines @@
     return false;
   return !memcmp(t1->front(), t2->front(), t1->size());
 }
 
 }  // namespace
 
 class TopSitesTest : public HistoryUnitTestBase {
  public:
   TopSitesTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
-        db_thread_(BrowserThread::DB, &message_loop_),
-        original_command_line_(*CommandLine::ForCurrentProcess()) {
+        db_thread_(BrowserThread::DB, &message_loop_) {
   }
 
   virtual void SetUp() {
     profile_.reset(new TestingProfile);
     if (CreateHistoryAndTopSites()) {
       profile_->CreateHistoryService(false, false);
       profile_->CreateTopSites();
       profile_->BlockUntilTopSitesLoaded();
     }
   }
 
   virtual void TearDown() {
     profile_.reset();
-    *CommandLine::ForCurrentProcess() = original_command_line_;
   }
 
   // Returns true if history and top sites should be created in SetUp.
   virtual bool CreateHistoryAndTopSites() {
     return true;
   }
 
   // Gets the thumbnail for |url| from TopSites.
   SkBitmap GetThumbnail(const GURL& url) {
     scoped_refptr<RefCountedMemory> data;
@@ skipping 153 matching lines @@
   bool AddPrepopulatedPages(MostVisitedURLList* urls) {
     return TopSites::AddPrepopulatedPages(urls);
   }
 
  private:
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   scoped_ptr<TestingProfile> profile_;
   CancelableRequestConsumer consumer_;
-  CommandLine original_command_line_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSitesTest);
 };  // Class TopSitesTest
 
 class TopSitesMigrationTest : public TopSitesTest {
  public:
   TopSitesMigrationTest() {}
 
   virtual void SetUp() {
     TopSitesTest::SetUp();
@@ skipping 1052 matching lines @@
   ui_test_utils::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_TOP_SITES_LOADED,
       content::Source<Profile>(profile()));
   profile()->CreateTopSites();
   profile()->GetHistoryService(Profile::EXPLICIT_ACCESS)->UnloadBackend();
   profile()->BlockUntilHistoryProcessesPendingRequests();
   observer.Wait();
 }
 
 }  // namespace history