Add a new GetInstance() method for singleton classes, take 2.

base/global_descriptors_posix.h

Index: base/global_descriptors_posix.h
diff --git a/base/global_descriptors_posix.h b/base/global_descriptors_posix.h
index 8ea743ee7263827814dd1eff1cc70442ccc1ba33..702a1243b9ae6914f2ecb5115e2ecf8f048ae4af 100644
--- a/base/global_descriptors_posix.h
+++ b/base/global_descriptors_posix.h
@@ -41,6 +41,13 @@ class GlobalDescriptors {
   // the following constant to the key value:
   static const int kBaseDescriptor = 3;  // 0, 1, 2 are already taken.
 
+  // Returns a pointer to the singleton object constructed with default traits.
+  static GlobalDescriptors* GetInstance();

[M-A Ruel, 2010/12/07 17:32:21]

You realize that you're creating two objects here? Why not just use the Leaky
one? The other one is for unit tests? If so, just put one of them in #if
defined(UNIT_TEST)

[Satish, 2010/12/07 17:45:27]

The leaky instance is created in src/chrome/app/chrome_main:LowLevelInit() for
mac and linux, so that lives through the lifetime of the app. In addition to
this various places in the code create the GlobalDescriptors singleton with
default traits. I have not modified this behavior as it looks to be done
intentionally, instead just added these 2 methods to wrap around them.

[M-A Ruel, 2010/12/07 17:49:17]

Ok, adding Evan to know if it was intentional.

[Evan Martin, 2010/12/07 17:55:16]

Ugh, no, this was definitely not intentional.  :(
Please let me fix the mess, and don't propagate it here.

+
+  // Returns a pointer to the singleton object constructed with leaky traits,
+  // i.e. one which won't be freed on shutdown.
+  static GlobalDescriptors* GetLeakyInstance();
+
   // Get a descriptor given a key. It is a fatal error if the key is not known.
   int Get(Key key) const;
   // Get a descriptor give a key. Returns -1 on error.