diff options
21 files changed, 83 insertions, 74 deletions
diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests index 1df2231..0c55802 100644 --- a/chrome/SConscript.unit_tests +++ b/chrome/SConscript.unit_tests @@ -6,6 +6,13 @@ Import('env_test') env_test = env_test.Clone() +if env_test['PLATFORM'] == 'posix': + env_test.Prepend( + LIBS = [ + 'event', + ] + ) + env_test.Prepend( CPPPATH = [ '$ICU38_DIR/public/common', @@ -118,16 +125,26 @@ unit_test_files = [] if env_test['PLATFORM'] in ('posix', 'win32'): # TODO(port): Port to Mac. unit_test_files.extend([ + 'browser/chrome_thread_unittest.cc', + 'browser/metrics_response_unittest.cc', 'browser/net/dns_host_info_unittest.cc', + 'browser/printing/page_range_unittest.cc', + 'browser/printing/page_setup_unittest.cc', + 'browser/printing/units_unittest.cc', 'browser/safe_browsing/chunk_range_unittest.cc', 'browser/safe_browsing/protocol_parser_unittest.cc', 'browser/safe_browsing/safe_browsing_util_unittest.cc', + 'common/animation_unittest.cc', + 'common/bzip2_unittest.cc', + 'common/jpeg_codec_unittest.cc', + 'common/json_value_serializer_unittest.cc', 'test/unit/run_all_unittests.cc', ]) env_test.Prepend( LIBS = [ 'browser', + 'common', ], ) @@ -143,7 +160,6 @@ if env_test['PLATFORM'] == 'win32': 'browser/bookmarks/bookmark_bar_unittest.cc', 'browser/bookmarks/bookmark_drag_data_unittest.cc', 'browser/cache_manager_host_unittest.cc', - 'browser/chrome_thread_unittest.cc', 'browser/controller_unittest.cc', 'browser/download_manager_unittest.cc', 'browser/encryptor_unittest.cc', @@ -165,15 +181,11 @@ if env_test['PLATFORM'] == 'win32': 'browser/history/visit_tracker_unittest.cc', 'browser/importer_unittest.cc', 'browser/metrics_log_unittest.cc', - 'browser/metrics_response_unittest.cc', 'browser/navigation_controller_unittest.cc', 'browser/net/dns_master_unittest.cc', 'browser/password_form_manager_unittest.cc', 'browser/printing/page_number_unittest.cc', 'browser/printing/page_overlays_unittest.cc', - 'browser/printing/page_range_unittest.cc', - 'browser/printing/page_setup_unittest.cc', - 'browser/printing/units_unittest.cc', 'browser/printing/win_printing_context_unittest.cc', 'browser/profile_manager_unittest.cc', 'browser/renderer_security_policy_unittest.cc', @@ -201,8 +213,6 @@ if env_test['PLATFORM'] == 'win32': 'browser/web_contents_unittest.cc', 'browser/webdata/web_database_unittest.cc', 'browser/window_sizer_unittest.cc', - 'common/animation_unittest.cc', - 'common/bzip2_unittest.cc', 'common/chrome_plugin_unittest.cc', 'common/gfx/emf_unittest.cc', 'common/gfx/icon_util_unittest.cc', @@ -210,8 +220,6 @@ if env_test['PLATFORM'] == 'win32': 'common/ipc_message_unittest.cc', 'common/ipc_sync_channel_unittest.cc', 'common/ipc_sync_message_unittest.cc', - 'common/jpeg_codec_unittest.cc', - 'common/json_value_serializer_unittest.cc', 'common/l10n_util_unittest.cc', 'common/mru_cache_unittest.cc', 'common/notification_service_unittest.cc', diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript index 14965ed..71d4fd3 100644 --- a/chrome/browser/SConscript +++ b/chrome/browser/SConscript @@ -60,13 +60,28 @@ input_files = [] if env['PLATFORM'] in ('posix', 'win32'): # TODO: Port to Mac. input_files.extend([ + 'browser_process.cc', + 'cancelable_request.cc', + 'chrome_thread.cc', + 'cross_site_request_manager.cc', + 'google_url_tracker.cc', + 'google_util.cc', + 'meta_table_helper.cc', + 'metrics_response.cc', + 'net/dns_host_info.cc', + 'page_state.cc', + 'printing/page_number.cc', 'printing/page_setup.cc', + 'printing/page_range.cc', 'printing/units.cc', - 'net/dns_host_info.cc', + 'renderer_security_policy.cc', 'safe_browsing/bloom_filter.cc', 'safe_browsing/chunk_range.cc', 'safe_browsing/protocol_parser.cc', 'safe_browsing/safe_browsing_util.cc', + 'session_startup_pref.cc', + 'url_fetcher_protect.cc', + 'user_metrics.cc', ]) if env['PLATFORM'] == 'win32': @@ -105,7 +120,6 @@ if env['PLATFORM'] == 'win32': 'browser_list.cc', 'browser_main.cc', 'browser_prefs.cc', - 'browser_process.cc', 'browser_process_impl.cc', 'browser_shutdown.cc', 'browser_url_handler.cc', @@ -113,14 +127,11 @@ if env['PLATFORM'] == 'win32': 'browsing_data_remover.cc', 'browsing_instance.cc', 'cache_manager_host.cc', - 'cancelable_request.cc', 'cert_store.cc', 'character_encoding.cc', 'chrome_plugin_browsing_context.cc', 'chrome_plugin_host.cc', - 'chrome_thread.cc', 'controller.cc', - 'cross_site_request_manager.cc', 'dom_ui/chrome_url_data_manager.cc', 'dom_ui/dom_ui_host.cc', 'dom_ui/html_dialog_contents.cc', @@ -148,8 +159,6 @@ if env['PLATFORM'] == 'win32': 'frame_util.cc', 'frame_view.cc', 'gears_integration.cc', - 'google_url_tracker.cc', - 'google_util.cc', 'hang_monitor/hung_plugin_action.cc', 'hang_monitor/hung_window_detector.cc', 'history/archived_database.cc', @@ -187,9 +196,7 @@ if env['PLATFORM'] == 'win32': 'jsmessage_box_handler.cc', 'login_prompt.cc', 'memory_details.cc', - 'meta_table_helper.cc', 'metrics_log.cc', - 'metrics_response.cc', 'metrics_service.cc', 'modal_html_dialog_delegate.cc', 'mork_reader.cc', @@ -202,16 +209,13 @@ if env['PLATFORM'] == 'win32': 'network_status_view.cc', 'google_update.cc', 'page_info_window.cc', - 'page_state.cc', 'password_form_manager.cc', 'password_manager.cc', 'plugin_installer.cc', 'plugin_process_host.cc', 'plugin_service.cc', 'point_buffer.cc', - 'printing/page_number.cc', 'printing/page_overlays.cc', - 'printing/page_range.cc', 'printing/print_job.cc', 'printing/print_job_manager.cc', 'printing/print_job_worker.cc', @@ -232,7 +236,6 @@ if env['PLATFORM'] == 'win32': 'render_widget_helper.cc', 'render_widget_host.cc', 'render_widget_host_hwnd.cc', - 'renderer_security_policy.cc', 'repost_Form_warning_dialog.cc', 'resource_dispatcher_host.cc', 'resource_message_filter.cc', @@ -251,7 +254,6 @@ if env['PLATFORM'] == 'win32': 'session_crashed_view.cc', 'session_restore.cc', 'session_service.cc', - 'session_startup_pref.cc', 'shell_integration.cc', 'simple_vista_frame.cc', 'simple_xp_frame.cc', @@ -287,10 +289,8 @@ if env['PLATFORM'] == 'win32': 'title_chomper.cc', 'toolbar_model.cc', 'url_fetcher.cc', - 'url_fetcher_protect.cc', 'url_fixer_upper.cc', 'user_data_dir_dialog.cc', - 'user_metrics.cc', 'view_source_contents.cc', 'visitedlink_master.cc', 'vista_frame.cc', diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h index 908af1a..16301e6 100644 --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h @@ -124,8 +124,10 @@ class BrowserProcess { // TODO(beng): remove once XPFrame/VistaFrame are gone. virtual bool IsUsingNewFrames() = 0; +#if defined(OS_WIN) // Returns an event that is signaled when the browser shutdown. virtual HANDLE shutdown_event() = 0; +#endif private: DISALLOW_EVIL_CONSTRUCTORS(BrowserProcess); diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h index df77476..8513bcb 100644 --- a/chrome/browser/cancelable_request.h +++ b/chrome/browser/cancelable_request.h @@ -237,7 +237,7 @@ class CancelableRequestConsumerT : public CancelableRequestConsumerBase { // Cancels all requests outstanding. void CancelAllRequests() { PendingRequestList copied_requests(pending_requests_); - for (PendingRequestList::iterator i = copied_requests.begin(); + for (typename PendingRequestList::iterator i = copied_requests.begin(); i != copied_requests.end(); ++i) i->first.provider->CancelRequest(i->first.handle); copied_requests.clear(); @@ -249,7 +249,7 @@ class CancelableRequestConsumerT : public CancelableRequestConsumerBase { // Gets the client data for all pending requests. void GetAllClientData(std::vector<T>* data) { DCHECK(data); - for (PendingRequestList::iterator i = pending_requests_.begin(); + for (typename PendingRequestList::iterator i = pending_requests_.begin(); i != pending_requests_.end(); ++i) data->push_back(i->second); } @@ -282,7 +282,7 @@ class CancelableRequestConsumerT : public CancelableRequestConsumerBase { virtual void OnRequestRemoved(CancelableRequestProvider* provider, CancelableRequestProvider::Handle handle) { - PendingRequestList::iterator i = + typename PendingRequestList::iterator i = pending_requests_.find(PendingRequest(provider, handle)); if (i == pending_requests_.end()) { NOTREACHED() << "Got a complete notification for a nonexistant request"; @@ -517,8 +517,9 @@ class CancelableRequest : public CancelableRequestBase { template<typename CB, typename Type> class CancelableRequest1 : public CancelableRequest<CB> { public: - explicit CancelableRequest1(CallbackType* callback) - : CancelableRequest(callback) { + explicit CancelableRequest1( + typename CancelableRequest<CB>::CallbackType* callback) + : CancelableRequest<CB>(callback) { } virtual ~CancelableRequest1() { diff --git a/chrome/browser/cross_site_request_manager.h b/chrome/browser/cross_site_request_manager.h index 09f3a7a..d7bf0b4 100644 --- a/chrome/browser/cross_site_request_manager.h +++ b/chrome/browser/cross_site_request_manager.h @@ -34,7 +34,7 @@ class CrossSiteRequestManager { bool has_pending); private: - friend DefaultSingletonTraits<CrossSiteRequestManager>; + friend struct DefaultSingletonTraits<CrossSiteRequestManager>; typedef std::set<std::pair<int, int> > RenderViewSet; // Obtain an instance of CrossSiteRequestManager via diff --git a/chrome/browser/google_url_tracker.cc b/chrome/browser/google_url_tracker.cc index 6bab5ec..6dfdbd6 100644 --- a/chrome/browser/google_url_tracker.cc +++ b/chrome/browser/google_url_tracker.cc @@ -4,6 +4,7 @@ #include "chrome/browser/google_url_tracker.h" +#include "base/compiler_specific.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" @@ -15,10 +16,9 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] = "http://www.google.com/"; GoogleURLTracker::GoogleURLTracker() - : google_url_(g_browser_process->local_state()->GetString( - prefs::kLastKnownGoogleURL)), -#pragma warning(suppress: 4355) // Okay to pass "this" here. - fetcher_factory_(this), + : google_url_(WideToUTF8(g_browser_process->local_state()->GetString( + prefs::kLastKnownGoogleURL))), + ALLOW_THIS_IN_INITIALIZER_LIST(fetcher_factory_(this)), in_startup_sleep_(true), already_fetched_(false), need_to_fetch_(false), diff --git a/chrome/browser/meta_table_helper.cc b/chrome/browser/meta_table_helper.cc index 2e607d5..0e17963 100644 --- a/chrome/browser/meta_table_helper.cc +++ b/chrome/browser/meta_table_helper.cc @@ -4,8 +4,6 @@ #include "chrome/browser/meta_table_helper.h" -#include <windows.h> - #include "base/logging.h" #include "base/string_util.h" #include "chrome/common/sqlite_utils.h" diff --git a/chrome/browser/metrics_log.h b/chrome/browser/metrics_log.h index 1c02371..657c8d7 100644 --- a/chrome/browser/metrics_log.h +++ b/chrome/browser/metrics_log.h @@ -53,11 +53,11 @@ class MetricsLog { // url - which URL was loaded // origin - what kind of action initiated the load // load_time - how long it took to load the page - void MetricsLog::RecordLoadEvent(int window_id, - const GURL& url, - PageTransition::Type origin, - int session_index, - TimeDelta load_time); + void RecordLoadEvent(int window_id, + const GURL& url, + PageTransition::Type origin, + int session_index, + TimeDelta load_time); // Records the current operating environment. Takes the list of installed // plugins as a parameter because that can't be obtained synchronously diff --git a/chrome/browser/metrics_response_unittest.cc b/chrome/browser/metrics_response_unittest.cc index 4e6dae6..e7c5825 100644 --- a/chrome/browser/metrics_response_unittest.cc +++ b/chrome/browser/metrics_response_unittest.cc @@ -76,7 +76,7 @@ static const struct ResponseCase { }; TEST(MetricsResponseTest, ParseResponse) { - for (int i = 0; i < arraysize(response_cases); ++i) { + for (size_t i = 0; i < arraysize(response_cases); ++i) { ResponseCase rcase = response_cases[i]; MetricsResponse response(rcase.response_xml); EXPECT_TRUE(response.valid()); @@ -101,7 +101,7 @@ TEST(MetricsResponseTest, ParseResponse) { static const char* bogus_responses[] = {"", "<respo"}; TEST(MetricsResponseTest, ParseBogusResponse) { - for (int i = 0; i < arraysize(bogus_responses); ++i) { + for (size_t i = 0; i < arraysize(bogus_responses); ++i) { MetricsResponse response(bogus_responses[i]); EXPECT_FALSE(response.valid()); } diff --git a/chrome/browser/metrics_service.h b/chrome/browser/metrics_service.h index bda5d1b..a4d8caf 100644 --- a/chrome/browser/metrics_service.h +++ b/chrome/browser/metrics_service.h @@ -156,7 +156,7 @@ class MetricsService : public NotificationObserver, // Save the pending_log_text_ persistently in a pref for transmission when we // next run. Note that IF this text is "too large," we just dicard it. - void MetricsService::PushPendingLogTextToUnsentOngoingLogs(); + void PushPendingLogTextToUnsentOngoingLogs(); // Start timer for next log transmission. void StartLogTransmissionTimer(); diff --git a/chrome/browser/page_state.cc b/chrome/browser/page_state.cc index 2b0c366..e0c350f 100644 --- a/chrome/browser/page_state.cc +++ b/chrome/browser/page_state.cc @@ -77,31 +77,25 @@ bool PageState::GetProperty(const std::wstring& key, std::wstring* value) const } void PageState::SetInt64Property(const std::wstring& key, int64 value) { - wchar_t buff[64]; - _i64tow_s(value, buff, arraysize(buff), 10); - SetProperty(key, buff); + SetProperty(key, Int64ToWString(value)); } bool PageState::GetInt64Property(const std::wstring& key, int64* value) const { std::wstring v; if (GetProperty(key, &v)) { - *value = _wtoi64(v.c_str()); - return true; + return StringToInt64(v, value); } return false; } void PageState::SetIntProperty(const std::wstring& key, int value) { - wchar_t buff[64]; - _itow_s(value, buff, arraysize(buff), 10); - SetProperty(key, buff); + SetProperty(key, IntToWString(value)); } bool PageState::GetIntProperty(const std::wstring& key, int* value) const { std::wstring v; if (GetProperty(key, &v)) { - *value = _wtoi(v.c_str()); - return true; + return StringToInt(v, value); } return false; } diff --git a/chrome/browser/printing/page_number.h b/chrome/browser/printing/page_number.h index 6042869..2782824 100644 --- a/chrome/browser/printing/page_number.h +++ b/chrome/browser/printing/page_number.h @@ -5,9 +5,7 @@ #ifndef CHROME_BROWSER_PRINTING_PAGE_NUMBER_H__ #define CHROME_BROWSER_PRINTING_PAGE_NUMBER_H__ -#ifdef _DEBUG #include <ostream> -#endif #include "chrome/browser/printing/page_range.h" @@ -65,8 +63,8 @@ class PageNumber { // Debug output support. template<class E, class T> -inline std::basic_ostream<E,T>& operator<<(std::basic_ostream<E,T>& ss, - const PageNumber& page) { +inline typename std::basic_ostream<E,T>& operator<<( + typename std::basic_ostream<E,T>& ss, const PageNumber& page) { return ss << page.ToInt(); } diff --git a/chrome/browser/printing/page_range_unittest.cc b/chrome/browser/printing/page_range_unittest.cc index ca404d8..d7a8d3f 100644 --- a/chrome/browser/printing/page_range_unittest.cc +++ b/chrome/browser/printing/page_range_unittest.cc @@ -18,7 +18,7 @@ TEST(PageRangeTest, RangeMerge) { range.to = 5; ranges.push_back(range); std::vector<int> pages(printing::PageRange::GetPages(ranges)); - ASSERT_EQ(8, pages.size()); + ASSERT_EQ(8U, pages.size()); EXPECT_EQ(1, pages[0]); EXPECT_EQ(2, pages[1]); EXPECT_EQ(3, pages[2]); @@ -32,6 +32,6 @@ TEST(PageRangeTest, RangeMerge) { TEST(PageRangeTest, Empty) { printing::PageRanges ranges; std::vector<int> pages(printing::PageRange::GetPages(ranges)); - EXPECT_EQ(0, pages.size()); + EXPECT_EQ(0U, pages.size()); } diff --git a/chrome/browser/printing/units_unittest.cc b/chrome/browser/printing/units_unittest.cc index 1adc931..ff85cb6 100644 --- a/chrome/browser/printing/units_unittest.cc +++ b/chrome/browser/printing/units_unittest.cc @@ -33,7 +33,8 @@ TEST(UnitsTest, Convertions) { EXPECT_EQ(0, ConvertUnit(2, 1000000000, 1)); EXPECT_EQ(2000000000, ConvertUnit(2, 1, 1000000000)); - EXPECT_EQ(4000000000, ConvertUnit(2, 1, 2000000000)); + EXPECT_EQ(4000000000U, + static_cast<unsigned int>(ConvertUnit(2, 1, 2000000000))); EXPECT_EQ(100, ConvertUnitDouble(100, 100, 100)); EXPECT_EQ(-100, ConvertUnitDouble(-100, 100, 100)); diff --git a/chrome/browser/renderer_security_policy.cc b/chrome/browser/renderer_security_policy.cc index 2bfb7ea..f72848a 100644 --- a/chrome/browser/renderer_security_policy.cc +++ b/chrome/browser/renderer_security_policy.cc @@ -72,7 +72,7 @@ class RendererSecurityPolicy::SecurityState { bool has_dom_ui_bindings_; - DISALLOW_EVIL_CONSTRUCTORS(RendererSecurityPolicy::SecurityState); + DISALLOW_COPY_AND_ASSIGN(SecurityState); }; RendererSecurityPolicy::RendererSecurityPolicy() { diff --git a/chrome/browser/renderer_security_policy.h b/chrome/browser/renderer_security_policy.h index 35492e4..86d1e73 100644 --- a/chrome/browser/renderer_security_policy.h +++ b/chrome/browser/renderer_security_policy.h @@ -94,7 +94,7 @@ class RendererSecurityPolicy { // Obtain an instance of RendererSecurityPolicy via GetInstance(). RendererSecurityPolicy(); - friend DefaultSingletonTraits<RendererSecurityPolicy>; + friend struct DefaultSingletonTraits<RendererSecurityPolicy>; // You must acquire this lock before reading or writing any members of this // class. You must not block while holding this lock. diff --git a/chrome/browser/session_startup_pref.cc b/chrome/browser/session_startup_pref.cc index a261983..d99043d 100644 --- a/chrome/browser/session_startup_pref.cc +++ b/chrome/browser/session_startup_pref.cc @@ -37,6 +37,9 @@ void SessionStartupPref::SetStartupPref(PrefService* prefs, case URLS: type = 4; break; + + default: + break; } prefs->SetInteger(prefs::kRestoreOnStartup, type); @@ -86,7 +89,7 @@ SessionStartupPref SessionStartupPref::GetStartupPref(PrefService* prefs) { if (url_pref_list->Get(i, &value)) { std::wstring url_text; if (value->GetAsString(&url_text)) - pref.urls.push_back(GURL(url_text)); + pref.urls.push_back(GURL(WideToUTF8(url_text))); } } diff --git a/chrome/common/SConscript b/chrome/common/SConscript index d5f7f5d3..3c0931c 100644 --- a/chrome/common/SConscript +++ b/chrome/common/SConscript @@ -51,12 +51,14 @@ input_files = [] if env['PLATFORM'] in ('posix', 'win32'): # TODO(port): Port to Mac. input_files.extend([ + 'animation.cc', 'chrome_constants.cc', 'chrome_counters.cc', 'chrome_switches.cc', 'debug_flags.cc', 'env_vars.cc', 'gfx/color_utils.cc', + 'ipc_message.cc', 'jpeg_codec.cc', 'json_value_serializer.cc', 'libxml_utils.cc', @@ -66,6 +68,7 @@ if env['PLATFORM'] in ('posix', 'win32'): 'pref_names.cc', 'slide_animation.cc', 'sqlite_compiled_statement.cc', + 'sqlite_utils.cc', 'task_queue.cc', 'throb_animation.cc', 'thumbnail_score.cc', @@ -75,7 +78,6 @@ if env['PLATFORM'] in ('posix', 'win32'): if env['PLATFORM'] == 'win32': # TODO(port): Port these. input_files.extend([ - 'animation.cc', 'child_process.cc', 'chrome_paths.cc', 'chrome_plugin_lib.cc', @@ -95,7 +97,6 @@ if env['PLATFORM'] == 'win32': 'ipc_channel.cc', 'ipc_channel_proxy.cc', 'ipc_logging.cc', - 'ipc_message.cc', 'ipc_message_utils.cc', 'ipc_sync_channel.cc', 'ipc_sync_message.cc', @@ -113,7 +114,6 @@ if env['PLATFORM'] == 'win32': 'resource_bundle.cc', 'resource_dispatcher.cc', 'security_filter_peer.cc', - 'sqlite_utils.cc', 'time_format.cc', 'win_safe_util.cc', 'win_util.cc', diff --git a/chrome/common/animation_unittest.cc b/chrome/common/animation_unittest.cc index 3f9da3c..f73e3cd 100644 --- a/chrome/common/animation_unittest.cc +++ b/chrome/common/animation_unittest.cc @@ -79,8 +79,8 @@ class TestAnimationDelegate : public AnimationDelegate { } private: - bool finished_; bool canceled_; + bool finished_; }; TEST_F(AnimationTest, RunCase) { diff --git a/chrome/common/json_value_serializer_unittest.cc b/chrome/common/json_value_serializer_unittest.cc index 16e6e61..3997205 100644 --- a/chrome/common/json_value_serializer_unittest.cc +++ b/chrome/common/json_value_serializer_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/basictypes.h" #include "base/file_util.h" #include "base/json_reader.h" #include "base/json_writer.h" @@ -186,7 +187,7 @@ void ValidateJsonList(const std::string& json) { ASSERT_TRUE(JSONReader::Read(json, &root, false)); ASSERT_TRUE(root && root->IsType(Value::TYPE_LIST)); ListValue* list = static_cast<ListValue*>(root); - ASSERT_EQ(1, list->GetSize()); + ASSERT_EQ(1U, list->GetSize()); Value* elt = NULL; ASSERT_TRUE(list->Get(0, &elt)); int value = 0; @@ -210,7 +211,7 @@ TEST(JSONValueSerializerTest, JSONReaderComments) { ASSERT_TRUE(JSONReader::Read("[\"// ok\\n /* foo */ \"]", &root, false)); ASSERT_TRUE(root && root->IsType(Value::TYPE_LIST)); ListValue* list = static_cast<ListValue*>(root); - ASSERT_EQ(1, list->GetSize()); + ASSERT_EQ(1U, list->GetSize()); Value* elt = NULL; ASSERT_TRUE(list->Get(0, &elt)); std::wstring value; @@ -236,7 +237,7 @@ namespace { // Create a fresh, empty copy of this directory. file_util::Delete(test_dir_, true); - CreateDirectory(test_dir_.c_str(), NULL); + file_util::CreateDirectory(test_dir_); } virtual void TearDown() { // Clean up test directory @@ -249,6 +250,8 @@ namespace { }; } // anonymous namespace +// TODO(port): Enable these when PathService::Get with DIR_TEST_DATA is ported. +#if defined(OS_WIN) TEST_F(JSONFileValueSerializerTest, Roundtrip) { std::wstring original_file_path; ASSERT_TRUE( @@ -339,4 +342,4 @@ TEST_F(JSONFileValueSerializerTest, NoWhitespace) { ASSERT_TRUE(root); delete root; } - +#endif // defined(OS_WIN) diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h index 8718cee..7b38d2f 100644 --- a/chrome/common/sqlite_utils.h +++ b/chrome/common/sqlite_utils.h @@ -5,6 +5,7 @@ #ifndef CHROME_COMMON_SQLITEUTILS_H_ #define CHROME_COMMON_SQLITEUTILS_H_ +#include <string> #include <vector> #include "base/basictypes.h" @@ -64,8 +65,8 @@ class SQLTransaction { virtual int BeginCommand(const char* command); virtual int EndCommand(const char* command); - bool began_; sqlite3* db_; + bool began_; DISALLOW_COPY_AND_ASSIGN(SQLTransaction); }; |