Revert 184352

chrome/browser/performance_monitor/database.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/performance_monitor/database.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 440 matching lines @@
                     &new_db);
   active_interval_db_ = scoped_ptr<leveldb::DB>(new_db);
   leveldb::DB::Open(open_options, path_.AppendASCII(kMetricDb).value(),
                     &new_db);
   metric_db_ = scoped_ptr<leveldb::DB>(new_db);
   leveldb::DB::Open(open_options, path_.AppendASCII(kEventDb).value(),
                     &new_db);
   event_db_ = scoped_ptr<leveldb::DB>(new_db);
 #elif defined(OS_WIN)
   leveldb::DB::Open(open_options,
-                    base::WideToUTF8(path_.AppendASCII(kRecentDb).value()),
-                    &new_db);
+                    WideToUTF8(path_.AppendASCII(kRecentDb).value()), &new_db);
   recent_db_ = scoped_ptr<leveldb::DB>(new_db);
   leveldb::DB::Open(open_options,
-                    base::WideToUTF8(path_.AppendASCII(kMaxValueDb).value()),
+                    WideToUTF8(path_.AppendASCII(kMaxValueDb).value()),
                     &new_db);
   max_value_db_ = scoped_ptr<leveldb::DB>(new_db);
   leveldb::DB::Open(open_options,
-                    base::WideToUTF8(path_.AppendASCII(kStateDb).value()),
-                    &new_db);
+                    WideToUTF8(path_.AppendASCII(kStateDb).value()), &new_db);
   state_db_ = scoped_ptr<leveldb::DB>(new_db);
   leveldb::DB::Open(open_options,
-      base::WideToUTF8(path_.AppendASCII(kActiveIntervalDb).value()),
-      &new_db);
+                    WideToUTF8(path_.AppendASCII(kActiveIntervalDb).value()),
+                    &new_db);
   active_interval_db_ = scoped_ptr<leveldb::DB>(new_db);
   leveldb::DB::Open(open_options,
-                    base::WideToUTF8(path_.AppendASCII(kMetricDb).value()),
-                    &new_db);
+                    WideToUTF8(path_.AppendASCII(kMetricDb).value()), &new_db);
   metric_db_ = scoped_ptr<leveldb::DB>(new_db);
   leveldb::DB::Open(open_options,
-                    base::WideToUTF8(path_.AppendASCII(kEventDb).value()),
-                    &new_db);
+                    WideToUTF8(path_.AppendASCII(kEventDb).value()), &new_db);
   event_db_ = scoped_ptr<leveldb::DB>(new_db);
 #endif
 }
 
 bool Database::Close() {
   CHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   metric_db_.reset();
   recent_db_.reset();
   max_value_db_.reset();
   state_db_.reset();
@@ skipping 36 matching lines @@
     start_time_key_ = key_builder_->CreateActiveIntervalKey(current_time);
     end_time = start_time_key_;
   } else {
     end_time = key_builder_->CreateActiveIntervalKey(clock_->GetTime());
   }
   last_update_time_ = current_time;
   active_interval_db_->Put(write_options_, start_time_key_, end_time);
 }
 
 }  // namespace performance_monitor