Run more unit tests on Linux:

- used string16 instead of wstring where needed
- replaced GetTickCount calls with portable functions from base/time.h
- misc GCC cleanups
- enabled following unit tests on Linux:

    browser/autocomplete/history_contents_provider_unittest.cc
    browser/autocomplete/history_url_provider_unittest.cc
    browser/autocomplete/keyword_provider_unittest.cc
    browser/bookmarks/bookmark_html_writer_unittest.cc

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

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

2 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/history/page_usage_data.h b/chrome/browser/history/page_usage_data.h
index b4e62fe..a4cd94f 100644
--- a/chrome/browser/history/page_usage_data.h
+++ b/chrome/browser/history/page_usage_data.h
@@ -5,11 +5,11 @@
 #ifndef CHROME_BROWSER_HISTORY_PAGE_USAGE_DATA_H__
 #define CHROME_BROWSER_HISTORY_PAGE_USAGE_DATA_H__
 
-#include "SkBitmap.h"
-
+#include "base/string16.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
 #include "googleurl/src/gurl.h"
+#include "skia/include/SkBitmap.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -52,11 +52,11 @@ class PageUsageData {
     return url_;
   }
 
-  void SetTitle(const std::wstring& s) {
+  void SetTitle(const string16& s) {
     title_ = s;
   }
 
-  const std::wstring& GetTitle() const {
+  const string16& GetTitle() const {
     return title_;
   }
 
@@ -130,7 +130,7 @@ class PageUsageData {
  private:
   history::URLID id_;
   GURL url_;
-  std::wstring title_;
+  string16 title_;
 
   SkBitmap* thumbnail_;
   bool thumbnail_set_;
diff --git a/chrome/browser/history/visitsegment_database.cc b/chrome/browser/history/visitsegment_database.cc
index 1687e13..6bab4972 100644
--- a/chrome/browser/history/visitsegment_database.cc
+++ b/chrome/browser/history/visitsegment_database.cc
@@ -317,7 +317,7 @@ void VisitSegmentDatabase::QuerySegmentUsage(
       statement2->column_string(0, &url);
       statement2->column_wstring(1, &title);
       pud->SetURL(GURL(url));
-      pud->SetTitle(title);
+      pud->SetTitle(WideToUTF16(title));
     }
     statement2->reset();
   }