[WebView] Flatten lib/main to lib

android_webview/lib/aw_main_delegate.cc

Index: android_webview/lib/aw_main_delegate.cc
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/aw_main_delegate.cc
similarity index 96%
rename from android_webview/lib/main/aw_main_delegate.cc
rename to android_webview/lib/aw_main_delegate.cc
index 004d9ad944779dfa496c437caf1f5269a292af05..700c01bf9ff4dc6d0aba5acff9d0603bb72d4b34 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/aw_main_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/lib/main/aw_main_delegate.h"
+#include "android_webview/lib/aw_main_delegate.h"
 
 #include <memory>
 
@@ -50,11 +50,9 @@
 
 namespace android_webview {
 
-AwMainDelegate::AwMainDelegate() {
-}
+AwMainDelegate::AwMainDelegate() {}
 
-AwMainDelegate::~AwMainDelegate() {
-}
+AwMainDelegate::~AwMainDelegate() {}
 
 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   content::SetContentClient(&content_client_);
@@ -76,7 +74,7 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   // Web Notification API and the Push API are not supported (crbug.com/434712)
   cl->AppendSwitch(switches::kDisableNotifications);
 
-  // WebRTC hardware decoding is not supported, internal bug 15075307
+// WebRTC hardware decoding is not supported, internal bug 15075307

[Torne, 2017/05/25 17:04:16]

It'd look nicer if you just moved the comment inside the #if and left it
indented. (which clang-format should be fine with)

[Shimi Zhang, 2017/05/25 17:40:41]

Done.

 #if BUILDFLAG(ENABLE_WEBRTC)
   cl->AppendSwitch(switches::kDisableWebRtcHWDecoding);
 #endif
@@ -239,8 +237,7 @@ void AwMainDelegate::ProcessExiting(const std::string& process_type) {
   logging::CloseLogFile();
 }
 
-content::ContentBrowserClient*
-    AwMainDelegate::CreateContentBrowserClient() {
+content::ContentBrowserClient* AwMainDelegate::CreateContentBrowserClient() {
   content_browser_client_.reset(new AwContentBrowserClient());
   return content_browser_client_.get();
 }
@@ -258,8 +255,7 @@ content::ContentGpuClient* AwMainDelegate::CreateContentGpuClient() {
   return content_gpu_client_.get();
 }
 
-content::ContentRendererClient*
-    AwMainDelegate::CreateContentRendererClient() {
+content::ContentRendererClient* AwMainDelegate::CreateContentRendererClient() {
   content_renderer_client_.reset(new AwContentRendererClient());
   return content_renderer_client_.get();
 }