Cleanup: Remove static storage for variables in an unnamed namespace.

BUG=none
TEST=none
R=binji

Review URL: https://chromiumcodereview.appspot.com/9271061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119535 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 14 insertions, 12 deletions

diff --git a/base/linux_util.cc b/base/linux_util.cc
index 247580d..0a9ef56 100644
--- a/base/linux_util.cc
+++ b/base/linux_util.cc
@@ -73,7 +73,7 @@ class LinuxDistroHelper {
 #endif  // if defined(OS_LINUX)
 
 // expected prefix of the target of the /proc/self/fd/%d link for a socket
-static const char kSocketLinkPrefix[] = "socket:[";
+const char kSocketLinkPrefix[] = "socket:[";
 
 // Parse a symlink in /proc/pid/fd/$x and return the inode number of the
 // socket.
diff --git a/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc
index 8d21d52..6cd5945 100644
--- a/base/nix/mime_util_xdg.cc
+++ b/base/nix/mime_util_xdg.cc
@@ -31,13 +31,13 @@
 
 namespace {
 
+class IconTheme;
+
 // None of the XDG stuff is thread-safe, so serialize all access under
 // this lock.
-static base::LazyInstance<base::Lock>::Leaky
+base::LazyInstance<base::Lock>::Leaky
     g_mime_util_xdg_lock = LAZY_INSTANCE_INITIALIZER;
 
-class IconTheme;
-
 class MimeUtilConstants {
  public:
   typedef std::map<std::string, IconTheme*> IconThemeMap;
diff --git a/base/path_service.cc b/base/path_service.cc
index 47278c3..46f394c 100644
--- a/base/path_service.cc
+++ b/base/path_service.cc
@@ -46,7 +46,7 @@ struct Provider {
   bool is_static;
 };
 
-static Provider base_provider = {
+Provider base_provider = {
   base::PathProvider,
   NULL,
 #ifndef NDEBUG
@@ -57,7 +57,7 @@ static Provider base_provider = {
 };
 
 #if defined(OS_WIN)
-static Provider base_provider_win = {
+Provider base_provider_win = {
   base::PathProviderWin,
   &base_provider,
 #ifndef NDEBUG
@@ -69,7 +69,7 @@ static Provider base_provider_win = {
 #endif
 
 #if defined(OS_MACOSX)
-static Provider base_provider_mac = {
+Provider base_provider_mac = {
   base::PathProviderMac,
   &base_provider,
 #ifndef NDEBUG
@@ -81,7 +81,7 @@ static Provider base_provider_mac = {
 #endif
 
 #if defined(OS_ANDROID)
-static Provider base_provider_android = {
+Provider base_provider_android = {
   base::PathProviderAndroid,
   &base_provider,
 #ifndef NDEBUG
@@ -93,7 +93,7 @@ static Provider base_provider_android = {
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-static Provider base_provider_posix = {
+Provider base_provider_posix = {
   base::PathProviderPosix,
   &base_provider,
 #ifndef NDEBUG
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc
index 884cd56..71b3bc6 100644
--- a/base/tracked_objects.cc
+++ b/base/tracked_objects.cc
@@ -19,11 +19,12 @@ using base::TimeDelta;
 namespace tracked_objects {
 
 namespace {
+
 // Flag to compile out almost all of the task tracking code.
-static const bool kTrackAllTaskObjects = true;
+const bool kTrackAllTaskObjects = true;
 
 // Flag to compile out parent-child link recording.
-static const bool kTrackParentChildLinks = false;
+const bool kTrackParentChildLinks = false;
 
 // When ThreadData is first initialized, should we start in an ACTIVE state to
 // record all of the startup-time tasks, or should we start up DEACTIVATED, so
@@ -31,8 +32,9 @@ static const bool kTrackParentChildLinks = false;
 // Note that the flag may force either state, so this really controls only the
 // period of time up until that flag is parsed. If there is no flag seen, then
 // this state may prevail for much or all of the process lifetime.
-static const ThreadData::Status kInitialStartupState =
+const ThreadData::Status kInitialStartupState =
     ThreadData::PROFILING_CHILDREN_ACTIVE;
+
 }  // namespace
 
 //------------------------------------------------------------------------------