[TabManager] Start function refactoring.

chrome/browser/memory/tab_manager.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 "chrome/browser/memory/tab_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 141 matching lines @@
   // Set up default callbacks. These may be overridden post-construction as
   // testing seams.
   get_current_pressure_level_ = base::Bind(&GetCurrentPressureLevel);
   notify_renderer_process_ = base::Bind(&NotifyRendererProcess);
 }
 
 TabManager::~TabManager() {
   Stop();
 }
 
+// Check the variation parameter to see if a tab be discarded more than once.
+// Default is to only discard once per tab.
+bool TabManager::CheckMultipleDiscards() {
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  std::string allow_multiple_discards = variations::GetVariationParamValue(
+      features::kAutomaticTabDiscarding.name, "AllowMultipleDiscards");
+  return (allow_multiple_discards == "true");
+
+#elif defined(OS_CHROMEOS)
+  // On Chrome OS, tab manager is always started and tabs can be discarded more
+  // than once.
+  return false;
+#endif

[Georges Khalil, 2016/05/16 18:41:22]

Let's simplify this. For CHROMEOS, always return false. Otherwise, check the
variation and return the value (so no need to explicitly check for WIN or
MACOSX).

[Anderson Silva, 2016/05/16 19:39:06]

I've also thought about that. I didn't do it though because I was wondering
about the other platforms such as iOS, Linux or Android. But if it's not an
issue to those, then yes it's simpler that way.

+}
+
 void TabManager::Start() {
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // If the feature is not enabled, do nothing.
   if (!base::FeatureList::IsEnabled(features::kAutomaticTabDiscarding))
     return;
 
-  // Check the variation parameter to see if a tab be discarded more than once.
-  // Default is to only discard once per tab.
-  std::string allow_multiple_discards = variations::GetVariationParamValue(
-      features::kAutomaticTabDiscarding.name, "AllowMultipleDiscards");
-  if (allow_multiple_discards == "true")
-    discard_once_ = true;
-  else
-    discard_once_ = false;
-
   // Check the variation parameter to see if a tab is to be protected for an
   // amount of time after being backgrounded. The value is in seconds.
   std::string minimum_protection_time_string =
       variations::GetVariationParamValue(features::kAutomaticTabDiscarding.name,
                                          "MinimumProtectionTime");
   if (!minimum_protection_time_string.empty()) {
     unsigned int minimum_protection_time_seconds = 0;
     if (base::StringToUint(minimum_protection_time_string,
                            &minimum_protection_time_seconds)) {
       if (minimum_protection_time_seconds > 0)
         minimum_protection_time_ =
             base::TimeDelta::FromSeconds(minimum_protection_time_seconds);
     }
   }
+#endif

[Georges Khalil, 2016/05/16 18:41:22]

Pasted by mistake?

[Anderson Silva, 2016/05/16 19:39:06]

No, that's actually because of the #if defined WIN or MAC up there. Maybe we'll
end up removing these as well as we follow refactoring the other parts.

 
-#elif defined(OS_CHROMEOS)
-  // On Chrome OS, tab manager is always started and tabs can be discarded more
-  // than once.
-  discard_once_ = false;
-#endif
+  // Check if multiple discards are allowed.
+  discard_once_ = CheckMultipleDiscards();

[Georges Khalil, 2016/05/16 18:41:22]

The logic here is inverted, as discard_once_ would be true if the function
return false.

[Anderson Silva, 2016/05/16 19:39:06]

You're right. But then I think we might have an issue or I misunderstood the
previous code. Let's sync in person.

 
   if (!update_timer_.IsRunning()) {
     update_timer_.Start(FROM_HERE,
                         TimeDelta::FromSeconds(kAdjustmentIntervalSeconds),
                         this, &TabManager::UpdateTimerCallback);
   }
 
   // MemoryPressureMonitor is not implemented on Linux so far and tabs are never
   // discarded.
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
@@ skipping 347 matching lines @@
   if (!command_line.HasSwitch(switches::kPurgeAndSuspendTime))
     return;
   int purge_and_suspend_time = 0;
   if (!base::StringToInt(
           command_line.GetSwitchValueASCII(switches::kPurgeAndSuspendTime),
           &purge_and_suspend_time)) {
     return;
   }
   if (purge_and_suspend_time <= 0)
     return;
-  auto purge_and_suspend_time_threshold = NowTicks() -
-      base::TimeDelta::FromSeconds(purge_and_suspend_time);
+  auto purge_and_suspend_time_threshold =
+      NowTicks() - base::TimeDelta::FromSeconds(purge_and_suspend_time);
   auto tab_stats = GetUnsortedTabStats();
   for (auto& tab : tab_stats) {
     if (!tab.render_process_host->IsProcessBackgrounded())
       continue;
     // TODO(hajimehoshi): Now calling PurgeAndSuspend is implemented without
     // timers for simplicity, so PurgeAndSuspend is called even after the
     // renderer is purged and suspended once. This should be replaced with
     // timers if we want necessary and sufficient signals.
     if (tab.last_active > purge_and_suspend_time_threshold)
       continue;
@@ skipping 302 matching lines @@
     }
   } else {
     // The code here can only be tested under a full browser test.
     AddTabStats(&stats_list);
   }
 
   return stats_list;
 }
 
 }  // namespace memory