Reland of r114615: "chrome.clear: Increasing granularity of public API"

chrome/browser/browsing_data_remover.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
 #pragma once
 
 #include <set>
 
@@ skipping 110 matching lines @@
   void RemoveObserver(Observer* observer);
 
   // Called when history deletion is done.
   void OnHistoryDeletionDone();
 
   static bool is_removing() { return removing_; }
 
  private:
   // The clear API needs to be able to toggle removing_ in order to test that
   // only one BrowsingDataRemover instance can be called at a time.
-  FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest, ClearOneAtATime);
+  FRIEND_TEST_ALL_PREFIXES(ExtensionClearTest, OneAtATime);
 
   enum CacheState {
     STATE_NONE,
     STATE_CREATE_MAIN,
     STATE_CREATE_MEDIA,
     STATE_DELETE_MAIN,
     STATE_DELETE_MEDIA,
     STATE_DONE
   };
 
@@ skipping 135 matching lines @@
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   CancelableRequestConsumer request_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_REMOVER_H_