Revert of Move GetProgramCounter in FROM_HERE to a common function

base/location.h

 // 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.
 
 #ifndef BASE_LOCATION_H_
 #define BASE_LOCATION_H_
 
 #include <stddef.h>
 
 #include <cassert>
@@ skipping 15 matching lines @@
            const char* file_name,
            int line_number,
            const void* program_counter);
 
   // Provide a default constructor for easy of debugging.
   Location();
 
   // Copy constructor.
   Location(const Location& other);
 
-  static Location CreateForCurrentProgramCounter(
-      const char* function_name,
-      const char* file_name,
-      int line_number);
-
   // Comparator for hash map insertion.
   // No need to use |function_name_| since the other two fields uniquely
   // identify this location.
   bool operator==(const Location& other) const {
     return line_number_ == other.line_number_ &&
            file_name_ == other.file_name_;
   }
 
   const char* function_name()   const { return function_name_; }
   const char* file_name()       const { return file_name_; }
@@ skipping 46 matching lines @@
   std::string file_name;
   std::string function_name;
   int line_number;
 };
 
 BASE_EXPORT const void* GetProgramCounter();
 
 // Define a macro to record the current source location.
 #define FROM_HERE FROM_HERE_WITH_EXPLICIT_FUNCTION(__func__)
 
-#define FROM_HERE_WITH_EXPLICIT_FUNCTION(function_name)        \
-  ::tracked_objects::Location::CreateForCurrentProgramCounter( \
-       function_name, __FILE__, __LINE__)                      \
+#define FROM_HERE_WITH_EXPLICIT_FUNCTION(function_name)                        \
+    ::tracked_objects::Location(function_name,                                 \
+                                __FILE__,                                      \
+                                __LINE__,                                      \
+                                ::tracked_objects::GetProgramCounter())
 
 }  // namespace tracked_objects
 
 #endif  // BASE_LOCATION_H_