Revert everything related to the relanding.

Review URL: http://codereview.chromium.org/2982009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52367 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jul 14, 2010 · 8efa680 · 8efa680
1 parent f56e694
commit 8efa680
Show file tree

Hide file tree

Showing 70 changed files with 76 additions and 111 deletions.
diff --git a/app/animation_container_unittest.cc b/app/animation_container_unittest.cc
@@ -5,7 +5,6 @@
 #include "app/animation_container.h"
 #include "app/linear_animation.h"
 #include "app/test_animation_delegate.h"
-#include "base/scoped_ptr.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/app/slide_animation_unittest.cc b/app/slide_animation_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "app/slide_animation.h"
 #include "app/test_animation_delegate.h"
-#include "base/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class SlideAnimationTest: public testing::Test {

diff --git a/base/message_loop.cc b/base/message_loop.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "base/compiler_specific.h"
-#include "base/histogram.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_pump_default.h"
@@ -28,53 +27,22 @@
 using base::Time;
 using base::TimeDelta;
 
-namespace {
-
 // A lazily created thread local storage for quick access to a thread's message
 // loop, if one exists.  This should be safe and free of static constructors.
-base::LazyInstance<base::ThreadLocalPointer<MessageLoop> > lazy_tls_ptr(
+static base::LazyInstance<base::ThreadLocalPointer<MessageLoop> > lazy_tls_ptr(
     base::LINKER_INITIALIZED);
 
+//------------------------------------------------------------------------------
+
 // Logical events for Histogram profiling. Run with -message-loop-histogrammer
 // to get an accounting of messages and actions taken on each thread.
-const int kTaskRunEvent = 0x1;
-const int kTimerEvent = 0x2;
+static const int kTaskRunEvent = 0x1;
+static const int kTimerEvent = 0x2;
 
 // Provide range of message IDs for use in histogramming and debug display.
-const int kLeastNonZeroMessageId = 1;
-const int kMaxMessageId = 1099;
-const int kNumberOfDistinctMessagesDisplayed = 1100;
-
-// Provide a macro that takes an expression (such as a constant, or macro
-// constant) and creates a pair to initalize an array of pairs.  In this case,
-// our pair consists of the expressions value, and the "stringized" version
-// of the expression (i.e., the exrpression put in quotes).  For example, if
-// we have:
-//    #define FOO 2
-//    #define BAR 5
-// then the following:
-//    VALUE_TO_NUMBER_AND_NAME(FOO + BAR)
-// will expand to:
-//   {7, "FOO + BAR"}
-// We use the resulting array as an argument to our histogram, which reads the
-// number as a bucket identifier, and proceeds to use the corresponding name
-// in the pair (i.e., the quoted string) when printing out a histogram.
-#define VALUE_TO_NUMBER_AND_NAME(name) {name, #name},
-
-const LinearHistogram::DescriptionPair event_descriptions_[] = {
-  // Provide some pretty print capability in our histogram for our internal
-  // messages.
-
-  // A few events we handle (kindred to messages), and used to profile actions.
-  VALUE_TO_NUMBER_AND_NAME(kTaskRunEvent)
-  VALUE_TO_NUMBER_AND_NAME(kTimerEvent)
-
-  {-1, NULL}  // The list must be null terminated, per API to histogram.
-};
-
-bool enable_histogrammer_ = false;
-
-}  // namespace
+static const int kLeastNonZeroMessageId = 1;
+static const int kMaxMessageId = 1099;
+static const int kNumberOfDistinctMessagesDisplayed = 1100;
 
 //------------------------------------------------------------------------------
 
@@ -598,6 +566,9 @@ bool MessageLoop::PendingTask::operator<(const PendingTask& other) const {
 // Method and data for histogramming events and actions taken by each instance
 // on each thread.
 
+// static
+bool MessageLoop::enable_histogrammer_ = false;
+
 // static
 void MessageLoop::EnableHistogrammer(bool enable) {
   enable_histogrammer_ = enable;
@@ -620,6 +591,34 @@ void MessageLoop::HistogramEvent(int event) {
     message_histogram_->Add(event);
 }
 
+// Provide a macro that takes an expression (such as a constant, or macro
+// constant) and creates a pair to initalize an array of pairs.  In this case,
+// our pair consists of the expressions value, and the "stringized" version
+// of the expression (i.e., the exrpression put in quotes).  For example, if
+// we have:
+//    #define FOO 2
+//    #define BAR 5
+// then the following:
+//    VALUE_TO_NUMBER_AND_NAME(FOO + BAR)
+// will expand to:
+//   {7, "FOO + BAR"}
+// We use the resulting array as an argument to our histogram, which reads the
+// number as a bucket identifier, and proceeds to use the corresponding name
+// in the pair (i.e., the quoted string) when printing out a histogram.
+#define VALUE_TO_NUMBER_AND_NAME(name) {name, #name},
+
+// static
+const LinearHistogram::DescriptionPair MessageLoop::event_descriptions_[] = {
+  // Provide some pretty print capability in our histogram for our internal
+  // messages.
+
+  // A few events we handle (kindred to messages), and used to profile actions.
+  VALUE_TO_NUMBER_AND_NAME(kTaskRunEvent)
+  VALUE_TO_NUMBER_AND_NAME(kTimerEvent)
+
+  {-1, NULL}  // The list must be null terminated, per API to histogram.
+};
+
 //------------------------------------------------------------------------------
 // MessageLoopForUI
 

diff --git a/base/message_loop.h b/base/message_loop.h
@@ -9,10 +9,11 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/lock.h"
+#include "base/histogram.h"
 #include "base/message_pump.h"
 #include "base/observer_list.h"
 #include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
 #include "base/task.h"
 
 #if defined(OS_WIN)
@@ -26,8 +27,6 @@
 #endif
 #endif
 
-class Histogram;
-
 // A MessageLoop is used to process events for a particular thread.  There is
 // at most one MessageLoop instance per thread.
 //
@@ -428,6 +427,9 @@ class MessageLoop : public base::MessagePump::Delegate {
   // If message_histogram_ is NULL, this is a no-op.
   void HistogramEvent(int event);
 
+  static const LinearHistogram::DescriptionPair event_descriptions_[];
+  static bool enable_histogrammer_;
+
   Type type_;
 
   // A list of tasks that need to be processed by this instance.  Note that

diff --git a/base/message_loop_proxy_impl_unittest.cc b/base/message_loop_proxy_impl_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy_impl.h"
-#include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"

diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h
@@ -5,9 +5,8 @@
 #ifndef BASE_OBSERVER_LIST_THREADSAFE_H_
 #define BASE_OBSERVER_LIST_THREADSAFE_H_
 
-#include <algorithm>
-#include <map>
 #include <vector>
+#include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/callback.h"

diff --git a/base/weak_ptr_unittest.cc b/base/weak_ptr_unittest.cc
@@ -5,7 +5,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "base/message_loop.h"
 #include "base/thread.h"
-#include "base/scoped_ptr.h"
 #include "base/weak_ptr.h"
 
 namespace base {

diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -7,7 +7,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"

diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"

diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
@@ -19,7 +19,6 @@
 #include <string>
 #include <vector>
 
-#include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"

diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
@@ -10,7 +10,6 @@
 #include "app/resource_bundle.h"
 #include "base/env_var.h"
 #include "base/event_recorder.h"
-#include "base/histogram.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/automation/automation_provider.h"

diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h
@@ -96,7 +96,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/task.h"
 
 class CancelableRequestBase;

diff --git a/chrome/browser/chrome_thread_unittest.cc b/chrome/browser/chrome_thread_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "base/scoped_ptr.h"
 #include "chrome/browser/chrome_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"

diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc
@@ -9,7 +9,6 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_util.h"

diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download_item_controller.mm
@@ -7,7 +7,6 @@
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
-#include "base/histogram.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"

diff --git a/chrome/browser/cocoa/external_protocol_dialog.mm b/chrome/browser/cocoa/external_protocol_dialog.mm
@@ -5,7 +5,6 @@
 #import "chrome/browser/cocoa/external_protocol_dialog.h"
 
 #include "app/l10n_util_mac.h"
-#include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"

diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
@@ -23,7 +23,6 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/debugger/devtools_remote.h"

diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
@@ -11,6 +11,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/task.h"
 #include "gfx/native_widget_types.h"
 
 #if defined(TOOLKIT_VIEWS)
@@ -29,6 +30,23 @@ class SkBitmap;
 
 namespace download_util {
 
+// DownloadProgressTask --------------------------------------------------------
+
+// A class for managing the timed progress animations for a download view. The
+// view must implement an UpdateDownloadProgress() method.
+template<class DownloadView>
+class DownloadProgressTask : public Task {
+ public:
+  explicit DownloadProgressTask(DownloadView* view) : view_(view) {}
+  virtual ~DownloadProgressTask() {}
+  virtual void Run() {
+    view_->UpdateDownloadProgress();
+  }
+ private:
+  DownloadView* view_;
+  DISALLOW_COPY_AND_ASSIGN(DownloadProgressTask);
+};
+
 // Download opening ------------------------------------------------------------
 
 // Whether it is OK to open this download.

diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
@@ -9,6 +9,7 @@
 
 #include "base/file_path.h"
 #include "base/ref_counted.h"
+#include "base/task.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/sandboxed_extension_unpacker.h"

diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/linked_ptr.h"
+#include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/extensions/extension.h"

diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
-#include "base/histogram.h"
 #include "base/rand_util.h"
 #include "base/sha2.h"
 #include "base/stl_util-inl.h"

diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
@@ -10,7 +10,6 @@
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/common/chrome_plugin_util.h"

diff --git a/chrome/browser/geolocation/access_token_store.h b/chrome/browser/geolocation/access_token_store.h
@@ -17,6 +17,7 @@
 
 #include "base/ref_counted.h"
 #include "base/string16.h"
+#include "base/task.h"
 #include "chrome/browser/cancelable_request.h"
 #include "googleurl/src/gurl.h"
 

diff --git a/chrome/browser/google_url_tracker.h b/chrome/browser/google_url_tracker.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/gtest_prod_util.h"
-#include "base/scoped_ptr.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"

diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
@@ -12,7 +12,6 @@
 #include "app/text_elider.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/histogram.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/browser.h"

diff --git a/chrome/browser/idle.h b/chrome/browser/idle.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_IDLE_H_
 #define CHROME_BROWSER_IDLE_H_
 
+#include "base/task.h"
+
 enum IdleState {
   IDLE_STATE_ACTIVE = 0,
   IDLE_STATE_IDLE = 1,   // No activity within threshold.

diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/task.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/common/net/predictor_common.h"

diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
@@ -6,7 +6,6 @@
 
 #include "app/l10n_util.h"
 #include "base/file_version_info.h"
-#include "base/histogram.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_child_process_host.h"

diff --git a/chrome/browser/net/chrome_net_log.h b/chrome/browser/net/chrome_net_log.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_NET_CHROME_NET_LOG_H_
 
 #include "base/observer_list.h"
-#include "base/scoped_ptr.h"
 #include "net/base/net_log.h"
 
 class PassiveLogCollector;

diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc
@@ -8,7 +8,6 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
-#include "base/histogram.h"
 #include "base/task.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"