RefCounted types should not have public destructors, content/browser part 1

content/browser/device_orientation/provider_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 <queue>
 
 #include "base/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "content/browser/device_orientation/data_fetcher.h"
 #include "content/browser/device_orientation/orientation.h"
@@ skipping 55 matching lines @@
 };
 
 // Class for injecting test orientation data into the Provider.
 class MockOrientationFactory : public base::RefCounted<MockOrientationFactory> {
  public:
   MockOrientationFactory() {
     EXPECT_FALSE(instance_);
     instance_ = this;
   }
 
-  ~MockOrientationFactory() {
-    instance_ = NULL;
-  }
-
   static DataFetcher* CreateDataFetcher() {
     EXPECT_TRUE(instance_);
     return new MockDataFetcher(instance_);
   }
 
   void SetOrientation(const Orientation& orientation) {
     base::AutoLock auto_lock(lock_);
     orientation_ = orientation;
   }
 
  private:
+  friend class base::RefCounted<MockOrientationFactory>;
+
+  ~MockOrientationFactory() {
+    instance_ = NULL;
+  }
+
   // Owned by ProviderImpl. Holds a reference back to MockOrientationFactory.
   class MockDataFetcher : public DataFetcher {
    public:
     explicit MockDataFetcher(MockOrientationFactory* orientation_factory)
         : orientation_factory_(orientation_factory) { }
 
     // From DataFetcher. Called by the Provider.
     virtual bool GetOrientation(Orientation* orientation) {
       base::AutoLock auto_lock(orientation_factory_->lock_);
       *orientation = orientation_factory_->orientation_;
@@ skipping 284 matching lines @@
   checker_b->AddExpectation(third_orientation);
   MessageLoop::current()->Run();
 
   provider_->RemoveObserver(checker_a.get());
   provider_->RemoveObserver(checker_b.get());
 }
 
 }  // namespace
 
 }  // namespace device_orientation