Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: chrome/browser/chrome_content_browser_client_unittest.cc

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h"
10 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "build/build_config.h"
12 #include "chrome/browser/search_engines/template_url_service_factory.h" 14 #include "chrome/browser/search_engines/template_url_service_factory.h"
13 #include "components/content_settings/core/browser/host_content_settings_map.h" 15 #include "components/content_settings/core/browser/host_content_settings_map.h"
14 #include "components/search_engines/template_url_service.h" 16 #include "components/search_engines/template_url_service.h"
15 #include "components/variations/entropy_provider.h" 17 #include "components/variations/entropy_provider.h"
16 #include "components/variations/variations_associated_data.h" 18 #include "components/variations/variations_associated_data.h"
17 #include "components/version_info/version_info.h" 19 #include "components/version_info/version_info.h"
18 #include "content/public/browser/navigation_controller.h" 20 #include "content/public/browser/navigation_controller.h"
19 #include "content/public/browser/navigation_entry.h" 21 #include "content/public/browser/navigation_entry.h"
20 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
21 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 368
367 NavigationEntry* entry = browser()->tab_strip_model()-> 369 NavigationEntry* entry = browser()->tab_strip_model()->
368 GetActiveWebContents()->GetController().GetLastCommittedEntry(); 370 GetActiveWebContents()->GetController().GetLastCommittedEntry();
369 ASSERT_TRUE(entry != NULL); 371 ASSERT_TRUE(entry != NULL);
370 EXPECT_EQ(url_rewritten, entry->GetURL()); 372 EXPECT_EQ(url_rewritten, entry->GetURL());
371 EXPECT_EQ(url_original, entry->GetVirtualURL()); 373 EXPECT_EQ(url_original, entry->GetVirtualURL());
372 } 374 }
373 375
374 } // namespace content 376 } // namespace content
375 #endif // !defined(OS_IOS) && !defined(OS_ANDROID) 377 #endif // !defined(OS_IOS) && !defined(OS_ANDROID)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client_browsertest.cc ('k') | chrome/browser/chrome_device_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698