Remove more ifdefs where all platforms now share the implementation.

Review URL: http://codereview.chromium.org/39017

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

3 files changed, 1 insertions, 19 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 57af5ab..c19d779 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/status_bubble.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
@@ -44,10 +45,6 @@
 #include "net/url_request/url_request_context.h"
 #include "webkit/glue/window_open_disposition.h"
 
-#if defined(OS_WIN) || defined(OS_LINUX)
-#include "chrome/browser/status_bubble.h"
-#endif
-
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index fcd89df..4acdf3a 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -1046,9 +1046,7 @@ void PeformUpdate(const std::wstring& initial_db,
                   std::vector<SBChunkDelete>* deletes) {
 // TODO(pinkerton): I don't think posix has any concept of IO counters, but
 // we can uncomment this when we implement ProcessMetrics::GetIOCounters
-#if defined(OS_WIN) || defined(OS_LINUX)
   IoCounters before, after;
-#endif
 
   FilePath path;
   PathService::Get(base::DIR_TEMP, &path);
@@ -1071,9 +1069,7 @@ void PeformUpdate(const std::wstring& initial_db,
   base::ProcessHandle handle = base::Process::Current().handle();
   scoped_ptr<base::ProcessMetrics> metric(
       base::ProcessMetrics::CreateProcessMetrics(handle));
-#if defined(OS_WIN) || defined(OS_LINUX)
   CHECK(metric->GetIOCounters(&before));
-#endif
 
   std::vector<SBListChunkRanges> lists;
   database->UpdateStarted();
@@ -1085,7 +1081,6 @@ void PeformUpdate(const std::wstring& initial_db,
   database->UpdateFinished(true);
   lists.clear();
 
-#if defined(OS_WIN) || defined(OS_LINUX)
   CHECK(metric->GetIOCounters(&after));
 
   LOG(INFO) << StringPrintf("I/O Read Bytes: %d",
@@ -1098,7 +1093,6 @@ void PeformUpdate(const std::wstring& initial_db,
       after.WriteOperationCount - before.WriteOperationCount);
   LOG(INFO) << StringPrintf("Finished in %d ms",
       (Time::Now() - before_time).InMilliseconds());
-#endif
 
   PrintStat("c:SB.HostSelect");
   PrintStat("c:SB.HostSelectForBloomFilter");
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 445dfbd..9d22924 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -394,15 +394,6 @@ class BookmarkBarView {
 //---------------------------------------------------------------------------
 // These stubs are for Browser
 
-#if defined(OS_MACOSX)
-class StatusBubble {
- public:
-  void SetStatus(const std::wstring&) { NOTIMPLEMENTED(); }
-  void Hide() { NOTIMPLEMENTED(); }
-  void SetURL(const GURL&, const std::wstring&) { NOTIMPLEMENTED(); }
-};
-#endif
-
 class DebuggerWindow : public base::RefCountedThreadSafe<DebuggerWindow> {
  public:
 };